Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -632,7 +632,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                "  user.id as id, " +
                "  user.name as realName, " +
                "  user.username as username, " +
                "  case user.locked when 0 then '已失效' when 1 then '生效中' end status, " +
                "  case user.enabled when 0 then '已失效' when 1 then '生效中' end status, " +
                "  user.mobile, " +
                "  saas.name as saasName, " +
                "  role.name as roleName " +

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -965,7 +965,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        //根据注册类型配置相应角色菜单,注册类型（1：厂商注册  0：平台注册）
        String roleId = "";
        if(companyDO.getAccountType().equals("0")){
            roleId = "paltform";
            roleId = "platform";
        }else if(companyDO.getAccountType().equals("1")){
            roleId = "company";
        }