Merge branch 'dev_ext_syc' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java

@@ -90,6 +90,31 @@ public class ExtUserInfoResultDTO implements Serializable {
      */
     private String gender = "";
 
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 显示昵称 xx网格-y先生/女士
+     * */
+    private String showName;
+
 
     /**
      * 用户角色列表

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -377,6 +377,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setProfile(userMsg.getHeadImgUrl());
             result.setNickname(userMsg.getNickname());
             result.setRealName(userMsg.getRealName());
+            result.setStreet(userMsg.getStreet());
+            result.setDistrict(userMsg.getDistrict());
+            result.setBuildingAddress(userMsg.getBuildingAddress());
+            result.setIdNum(userMsg.getIdNum());
+            result.setShowName(userMsg.getShowName());
             // 2020.11.24 sun  start
             result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
             List<UserWechatEntity> list = userWechatDao.selectByUserId(param.getUserId());