Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

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;
 }

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;
 }

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;
+}