From c9fd35cf2875817614375b959d412bc27c39f418 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Fri, 20 Aug 2021 18:48:36 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java index bbbd9a2..1e2c805 100644 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java @@ -162,4 +162,9 @@ public class NoticeDTO implements Serializable { private String typeName; -} \ No newline at end of file + /** + * 索引图 + */ + private String imgUrl; + +} From f98ec47859e104f721b017c0155e3940bda8f630 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 30 Aug 2021 19:02:27 +0800 Subject: [PATCH 02/11] =?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 03/11] =?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 04/11] =?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 05/11] =?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 06/11] =?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 07/11] =?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; /** *头像地址 From 037ee6574bf347ae34d5251735a99c5511d81794 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 31 Aug 2021 12:06:23 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E8=B5=84?= =?UTF-8?q?=E8=AE=AF=E6=A0=8F=E7=9B=AEsql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/epdc/result/EpdcContentDetailResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java index 5b3630a..2edfd40 100644 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java +++ b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java @@ -41,4 +41,9 @@ public class EpdcContentDetailResultDTO implements Serializable { * 浏览数 */ private String readingAmount; + + /** + * 内容 + */ + private String noticeContent; } From 492ca0bd1716eca3439b0604c60ebda5910f62f2 Mon Sep 17 00:00:00 2001 From: rongchao Date: Tue, 31 Aug 2021 18:17:06 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1.=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202.=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/house/PopulationInformationDTO.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java index d4f30e3..360f2ed 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java @@ -113,6 +113,11 @@ public class PopulationInformationDTO implements Serializable { */ private String militaryService; + /** + * 特殊人群 + */ + private String specialCrowd; + /** * 户籍地 */ @@ -294,6 +299,6 @@ public class PopulationInformationDTO implements Serializable { /** * 接种状态 0未接种 1接种中 2接种完成 */ - private String vaccinationState; + private Integer vaccinationState; } \ No newline at end of file From 120dd0f5b8bff37519bc01ed27045fa5b685cf4a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 1 Sep 2021 16:20:08 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=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 --- .../esua/epdc/volunteer/VactInfoDTO.java | 176 ++++++++++++++++++ .../epdc/volunteer/VactOrgRelationDTO.java | 81 ++++++++ 2 files changed, 257 insertions(+) create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java create mode 100644 epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactOrgRelationDTO.java diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java new file mode 100644 index 0000000..8d18f1e --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java @@ -0,0 +1,176 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.volunteer; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 志愿活动表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-01 + */ +@Data +public class VactInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 标题 + */ + private String title; + + /** + * 活动头图 + */ + private String headPic; + + /** + * 活动开始时间 + */ + private Date actStartTime; + + /** + * 活动结束时间 + */ + private Date actEndTime; + + /** + * 活动地点 + */ + private String actAddress; + + /** + * 报名要求 + */ + private String requirement; + + /** + * 活动内容 + */ + private String actContent; + + /** + * 是否只允许志愿者参加 0否 1是 + */ + private String volunteerFlag; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系电话 + */ + private String tel; + + /** + * 审核状态：0-审核中，5-未通过，10-待发布，15已发布 + */ + private String state; + + /** + * 审核理由 + */ + private String reason; + + /** + * 用户ID + */ + private String userId; + + /** + * 头像地址 + */ + private String faceImg; + + /** + * 党员标识：0否1是 + */ + private String partyFlag; + + /** + * 部门ID + */ + private String deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 删除标识 0-否，1-是 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactOrgRelationDTO.java b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactOrgRelationDTO.java new file mode 100644 index 0000000..4e8f5ca --- /dev/null +++ b/epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactOrgRelationDTO.java @@ -0,0 +1,81 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.volunteer; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 志愿活动 志愿组织 关联表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-01 + */ +@Data +public class VactOrgRelationDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 志愿活动id + */ + private String vactId; + + /** + * 志愿组织id + */ + private Long volunteerOrgId; + + /** + * 删除标识 0-否，1-是 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file From 163f7a604be9de14b544f9c189a89f62b0ac33e0 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 1 Sep 2021 18:00:29 +0800 Subject: [PATCH 11/11] =?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-pc,=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AB=AFbug=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=E8=A9=B3=E6=83=85=E6=9F=A5=E8=A9=A2=E4=BC=A0=E5=8F=82=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AF=B9=E8=B1=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/UserInfoDTO.java | 122 ++++++++++++++++++ .../form/EpdcAppIdentityDetailFormDTO.java | 22 ++++ .../epdc/form/EpdcAppShowIdentityFormDTO.java | 3 + 3 files changed, 147 insertions(+) create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java new file mode 100644 index 0000000..90cfd37 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java @@ -0,0 +1,122 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 用户信息表 用户信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-31 + */ +@Data +public class UserInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识号 + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 头像地址 + */ + private String headUrl; + + /** + * 名字 + */ + private String realName; + + /** + * 电话 + */ + private String mobile; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 格言 + */ + private String motto; + + /** + * 承诺 + */ + private String promise; + + /** + * 服务范围 + */ + private String serviceArea; + + /** + * 推荐标识 0-否，1-是 + */ + private String recommendFlag; + + /** + * 推荐时间 + */ + private Date recommendTime; + + /** + * 删除标识 0-否，1-是 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java new file mode 100644 index 0000000..419350f --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 亮身份详情 + * create time: 2021/8/31$ 14:57$ + */ +@Data +public class EpdcAppIdentityDetailFormDTO implements Serializable { + private static final long serialVersionUID = -951939570282533218L; + + /** + *用户id + */ + @NotBlank(message = "用户id不能为空") + private String userId; +} 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 ad58b6e..3caa982 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 @@ -1,7 +1,9 @@ package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; +import lombok.NonNull; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -17,6 +19,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable { /** *用户ID */ + @NotBlank(message = "用户id不为空") private String userId; /**