Merge branch 'master' into 'develop'

Merge branch 'develop_2.4.0_LogManage' into 'master'

See merge request dcuc-tjdsj/auth-web!15