Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserInfoResponse.java

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 public class UserInfoResponse {
     private String companyName;//公司名
     private String roleName;//角色名
+    private String roleCode;//角色编码
     private String userName;//用户名
     private BigDecimal balance;//用户余额
     private String avatarUrl;//用户头像路径

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -336,6 +336,7 @@ public class UserService implements IUserService {
         //设置角色信息
         Role role = roleService.getRoleByUserIdAndCompanyId(userId, companyId);
         if (role != null) {
+            userInfoResponse.setRoleCode(role.getCode());
             userInfoResponse.setRoleName(role.getName());
         }
         //设置公司信息