From 3babd40f7c98f64dc2cfd4d691da0c5bbac0995a Mon Sep 17 00:00:00 2001 From: gaofan Date: Mon, 10 Jul 2023 13:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E3=80=81=E5=B7=A5=E4=BD=9C=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E3=80=81=E6=89=80=E5=B1=9E=E8=A1=8C=E4=B8=9A=E3=80=81=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B8=82=E5=8C=97=E7=AD=89=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java | 5 +++++ .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java index 077196267..51475f289 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -31,4 +31,9 @@ public class EpdcUserInfoResultDTO implements Serializable { private Boolean haveEnterprise; + private String workUnit; + private String workType; + private String workIndustry; + private Integer shibei; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 0e6b25826..558fb8157 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -20,6 +20,10 @@ eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE AS dwellingPlace, eu.PARTY_FLAG AS partyFlag, + eu.SHIBEI AS shibei, + eu.WORK_UNIT AS workUnit, + eu.WORK_TYPE AS workType, + eu.WORK_INDUSTRY AS workIndustry, eugr.GRID_ID AS gridId, eugr.GRID AS gridName, eugr.PARENT_DEPT_IDS AS parentDeptIds,