Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminRoleLogic.java

@@ -144,7 +144,7 @@ public class AdminRoleLogic {
     public List<RoleTypeBean> getRoleType() {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<RoleTypeBean> list = new ArrayList<>();
-        if (adminUser.getType() == 0) {
+        if (adminUser.getType() == 2) {
             RoleTypeBean bean = new RoleTypeBean();
             bean.setCode(2);
             bean.setName("平台");
@@ -152,7 +152,7 @@ public class AdminRoleLogic {
         }
         RoleTypeBean bean2 = new RoleTypeBean();
         bean2.setCode(1);
-        bean2.setName("平台");
+        bean2.setName("企业");
         list.add(bean2);
 
         RoleTypeBean bean3 = new RoleTypeBean();