Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -451,6 +451,7 @@ public class UserInfoManage {
             resUserDetailVO.setOrgCode(userFullInfo.getOrganizationCode());
             resUserDetailVO.setOrgName(userFullInfo.getOrganizationName());
             resUserDetailVO.setRegionCode(userFullInfo.getRegionCode());
+            resUserDetailVO.setRegionLevel(userFullInfo.getRegionLevel());
             resUserDetailVO.setRegionName(regionCacheHelper.getRegionName(userFullInfo.getRegionCode()
                     , RegionConst.RL_COUNTY));
             resUserDetailVO.setEmpPosUnitCode(userFullInfo.getEmpPosUnitCode());

pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java

@@ -42,6 +42,7 @@ public class ResUserDetailVO {
     @ApiModelProperty("所属区域")
     private Long regionId;
     private String regionCode;
+    private Integer regionLevel;
     private String regionName;
 
     @ApiModelProperty("用户任职所在单位code")