Merge branch 'master' into develop
case 2469 - Added new roles for dingcategory menu.
case 2469 - Tiny refactor.
Merge branch 'case-2469' into develop
Merge remote-tracking branch 'origin/develop'