diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index f4bd2a1886..6a23e0cc1c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -73,10 +73,24 @@ public class CollectListResultDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径,包含自己,英文逗号隔开例如:37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + /** + * 备注 + */ + private String remark; } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 9820bdf7d4..1269859264 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -56,7 +56,10 @@ m.HE_SUAN_COUNT AS heSuanCount, m.YMJZ AS ymjz, m.DOMICILE_PLACE as domicilePlace, - m.WORK_PLACE as workPlace + m.DOMICILE_PLACE_CODE as domicilePlaceCode, + m.DOMICILE_PLACE_CODE_PATH as domicilePlaceCodePath, + m.WORK_PLACE as workPlace, + m.REMARK as remark from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id}