From c993864bc134b2fe8c2929472333bd58549e5071 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 15:41:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/group/form/MemExitGroupFormDTO.java   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java
new file mode 100644
index 0000000000..babcea3675
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MemExitGroupFormDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 组员自主退群
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/30 15:06
+ */
+@Data
+public class MemExitGroupFormDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 3614704443675949069L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 小组ID
+     */
+    @NotBlank(message = "小组Id不能为空", groups = AddUserInternalGroup.class)
+    private String groupId;
+
+
+    /**
+     * 当前客户id
+     */
+    @NotBlank(message = "tokenDto获取customerId不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "tokenDto获取userId不能为空", groups = AddUserInternalGroup.class)
+    private String userId;
+}

From 14317135cfea8f8cd00284c80536d6f55898eac8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 15:47:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/ActDetailGovResultDTO.java    | 5 +++++
 .../epmet/resi/group/dto/act/result/ActDetailResultDTO.java | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java
index c10c9cf2ec..2c321843ee 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java
@@ -138,4 +138,9 @@ public class ActDetailGovResultDTO implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 最后一次编辑时间；首次发布与CREATED_TIME一致
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date changedTime;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
index 5644075e3b..8f18eae94d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
@@ -168,4 +168,10 @@ public class ActDetailResultDTO implements Serializable {
      * 客户id
      */
     private String customerId;
+
+    /**
+     * 最后一次编辑时间；首次发布与CREATED_TIME一致
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date changedTime;
 }