From 40bd0613d9f3dd621d327713e3d7f15c656570f3 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sun, 29 Aug 2021 09:38:06 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=AE=E8=BA=AB=E4=BB=BD=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index e36671a..932dd01 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -31,4 +31,9 @@ public class EpdcUserInfoResultDTO implements Serializable { */ private Integer grade; + /** + * 亮身份标识：0-否，1-是 + */ + private String showIdentityFlag; + } From 33f8f89de3d6582a3042c018bfab60310117ea9a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sun, 29 Aug 2021 11:43:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/volunteer/VolunteerPageDTO.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java new file mode 100644 index 0000000..349b932 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerPageDTO.java @@ -0,0 +1,62 @@ +package com.elink.esua.epdc.volunteer; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epdc-cloud-heart-yushan + * @description: + * @author: wangtong + * @create: 2021-08-29 09:49 + **/ +@Data +public class VolunteerPageDTO implements Serializable { + + /** + * 主键 + */ + private String id; + + /** + * 姓名 + */ + private String realName; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 自我介绍 + */ + private String introduceInfo; + + /** + * 认证状态：0审核中 1审核通过 2审核驳回 + */ + private String state; + + /** + * 状态名称 + */ + private String stateName; + + /** + * 审核理由 + */ + private String reason; + + /** + * 认组织 + */ + private String volunteerOrgNames; + + +} \ No newline at end of file From 580587a618b539c4d0a6b5648d06cb100e9ff5b5 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Aug 2021 13:45:36 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/volunteer/AppVolunteerApplyDTO.java | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java new file mode 100644 index 0000000..5a3ac36 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java @@ -0,0 +1,91 @@ +package com.elink.esua.epdc.volunteer; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epdc-cloud-api-yushan + * @description: + * @author: wangtong + * @create: 2021-08-30 10:43 + **/ +@Data +public class AppVolunteerApplyDTO implements Serializable { + + /** + *id + */ + private String id; + + /** + *身份证 + */ + private String idCard; + + /** + *手机 + */ + private String mobile; + + /** + *织织id + */ + private List volunteerOrgIds; + + /** + *自我介绍 + */ + private String introduceInfo; + + /** + *姓名 + */ + private String realName; + + + /** + * 网格 + */ + private String dept; + /** + * 网格ID + */ + private Long deptId; + + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 用户ID + */ + private String userId; + + /** + * 用户头像 + */ + private String faceImg; + + /** + * 党员标识 + */ + private Integer partyFlag; + + + +} \ No newline at end of file From 848c038a0f51c463545386c1e218a331a62692ff Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Aug 2021 13:58:17 +0800 Subject: [PATCH 04/13] =?UTF-8?q?dto=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java index 5a3ac36..57604eb 100644 --- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java @@ -48,7 +48,7 @@ public class AppVolunteerApplyDTO implements Serializable { /** * 网格 */ - private String dept; + private String deptName; /** * 网格ID */ From c1da2d73a394c61eb364da793050bb4aa03a3ac3 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Aug 2021 16:02:03 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=BF=97=E6=84=BF=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/volunteer/AppVolunteerDetailDTO.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java new file mode 100644 index 0000000..07a0273 --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerDetailDTO.java @@ -0,0 +1,68 @@ +package com.elink.esua.epdc.volunteer; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epdc-cloud-heart-yushan + * @description: + * @author: wangtong + * @create: 2021-08-29 09:49 + **/ +@Data +public class AppVolunteerDetailDTO implements Serializable { + + /** + * 主键 + */ + private String id; + + /** + * 姓名 + */ + private String realName; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 自我介绍 + */ + private String introduceInfo; + + /** + * 认证状态：0审核中 1审核通过 2审核驳回 + */ + private String state; + + /** + * 状态名称 + */ + private String stateName; + + /** + * 审核理由 + */ + private String reason; + + /** + * 组织id + */ + private List volunteerOrgIds; + + /** + * 认组织 + */ + private String volunteerOrgNames; + + +} \ No newline at end of file From 5ad136e7a2aba0e6d4e0b0dbc204a5aae62311bb Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 17:36:01 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BD=91=E6=A0=BC=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=20admin=E5=90=8E=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/EpdcAppGridManFormDTO.java | 32 +++++++++++++++++ .../result/EpdcAppGridManListResultDTO.java | 36 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java create mode 100644 epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java new file mode 100644 index 0000000..b4161b5 --- /dev/null +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppGridManFormDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 网格员列表请求接口对象 + * create time: 2021/8/28$ 18:11$ + */ +@Data +public class EpdcAppGridManFormDTO implements Serializable { + + private static final long serialVersionUID = 682964925596811152L; + + /** + *页码 + */ + private int pageIndex; + + /** + *页容量 + */ + private int pageSize; + + /** + *所属网格id + */ + private Long deptId; + +} diff --git a/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java new file mode 100644 index 0000000..f44832d --- /dev/null +++ b/epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppGridManListResultDTO.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 网格员列表返回对象 + * create time: 2021/8/28$ $ + */ +@Data +public class EpdcAppGridManListResultDTO implements Serializable { + private static final long serialVersionUID = -2712265120736911585L; + + + /** + *姓名 + */ + private String realName; + + /** + *头像 + */ + private String headHrl; + + /** + *箴言 + */ + private String proverbs; + + /** + *电话 + */ + private String mobile; +} From 8a436049ae6ccd3e159bc7c76895ca5362a12f82 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 17:40:32 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/form/EpdcAppShowIdentityFormDTO.java | 41 +++++++++++++++++++ .../EpdcAppIdentityDetailResultDTO.java | 35 ++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java new file mode 100644 index 0000000..469d7f5 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 党员亮身份信息入库请求参数 + * create time: 2021/8/28$ 19:10$ + */ +@Data +public class EpdcAppShowIdentityFormDTO implements Serializable { + + private static final long serialVersionUID = -5593165602745999938L; + + /** + *用户ID + */ + private Long userId; + + /** + *头像地址 + */ + private String headUrl; + + /** + *格言 + */ + private String motto; + + /** + *承诺 + */ + private String promise; + + /** + *服务范围 + */ + private String serviceArea; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java new file mode 100644 index 0000000..09510d5 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIdentityDetailResultDTO.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 党员亮身份信息详情返回对象 + * create time: 2021/8/28$ 19:52$ + */ +@Data +public class EpdcAppIdentityDetailResultDTO implements Serializable { + private static final long serialVersionUID = 3740385980880312741L; + + /** + *格言 + */ + private String motto; + + /** + *承诺 + */ + private String promise; + + /** + *服务范围 + */ + private String serviceArea; + + /** + *头像 + */ + private String headUrl; +} From f98ec47859e104f721b017c0155e3940bda8f630 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Aug 2021 19:02:27 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java index 57604eb..02887c2 100644 --- a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java @@ -52,7 +52,7 @@ public class AppVolunteerApplyDTO implements Serializable { /** * 网格ID */ - private Long deptId; + private String deptId; /** * 父所有部门ID @@ -84,7 +84,7 @@ public class AppVolunteerApplyDTO implements Serializable { /** * 党员标识 */ - private Integer partyFlag; + private String partyFlag; From c9431acdb36c5e352571621280c26c019db1521d Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 19:27:53 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcAppIdentityDetailResultDTO.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java deleted file mode 100644 index 089936c..0000000 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * create by: zhangfenghe - * description: 党员亮身份信息详情返回对象 - * create time: 2021/8/28$ 19:52$ - */ -@Data -public class EpdcAppIdentityDetailResultDTO implements Serializable { - private static final long serialVersionUID = 3740385980880312741L; - - /** - *格言 - */ - private String motto; - - /** - *承诺 - */ - private String promise; - - /** - *服务范围 - */ - private String serviceArea; - - /** - *头像 - */ - private String headUrl; -} From 14e5eb21cc453549f19b84734f83ae461d27fb82 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 19:57:09 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20bu?= =?UTF-8?q?g=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/form/EpdcAppGridManFormDTO.java | 32 --------------- .../dto/form/EpdcAppShowIdentityFormDTO.java | 41 ------------------- 2 files changed, 73 deletions(-) delete mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java delete mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java deleted file mode 100644 index 68ad9d1..0000000 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import java.io.Serializable; - -/** - * create by: zhangfenghe - * description: 网格员列表请求接口对象 - * create time: 2021/8/28$ 18:11$ - */ -@Data -public class EpdcAppGridManFormDTO implements Serializable { - - private static final long serialVersionUID = 682964925596811152L; - - /** - *页码 - */ - private int pageIndex; - - /** - *页容量 - */ - private int pageSize; - - /** - *所属网格id - */ - private Long deptId; - -} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java deleted file mode 100644 index 8f50838..0000000 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import java.io.Serializable; - -/** - * create by: zhangfenghe - * description: 党员亮身份信息入库请求参数 - * create time: 2021/8/28$ 19:10$ - */ -@Data -public class EpdcAppShowIdentityFormDTO implements Serializable { - - private static final long serialVersionUID = -5593165602745999938L; - - /** - *用户ID - */ - private Long userId; - - /** - *头像地址 - */ - private String headUrl; - - /** - *格言 - */ - private String motto; - - /** - *承诺 - */ - private String promise; - - /** - *服务范围 - */ - private String serviceArea; -} From 0f92bfb9970dfbbb8adfbe4e0dc181faa1bbfc26 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 20:04:11 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89Dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/EpdcAppGridManListResultDTO.java | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java deleted file mode 100644 index 49aa91c..0000000 --- a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * create by: zhangfenghe - * description: 网格员列表返回对象 - * create time: 2021/8/28$ $ - */ -@Data -public class EpdcAppGridManListResultDTO implements Serializable { - private static final long serialVersionUID = -2712265120736911585L; - - - /** - *姓名 - */ - private String realName; - - /** - *头像 - */ - private String headHrl; - - /** - *箴言 - */ - private String proverbs; - - /** - *电话 - */ - private String mobile; -} From 75432845136e097a371f0a89124a1095df0c81b1 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 31 Aug 2021 00:06:51 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20bu?= =?UTF-8?q?g=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java index 469d7f5..ad58b6e 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java @@ -17,7 +17,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable { /** *用户ID */ - private Long userId; + private String userId; /** *头像地址 From 2002275b5e29bb8648e0bacc4b8f507ba7fa9c53 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 31 Aug 2021 00:09:39 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BDbug-=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java index 469d7f5..ad58b6e 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java @@ -17,7 +17,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable { /** *用户ID */ - private Long userId; + private String userId; /** *头像地址