Merge branch 'dev_ext_syc' into dev

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

@@ -110,12 +110,6 @@ public class ExtUserInfoResultDTO implements Serializable {
      */
     private String idNum;
 
-    /**
-     * 显示昵称 xx网格-y先生/女士
-     * */
-    private String showName;
-
-
     /**
      * 用户角色列表
      * */

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

@@ -381,7 +381,6 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             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());