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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java

@@ -29,7 +29,7 @@ public class EditGroupFormDTO {
     private String groupHeadPhoto;
 
     @NotBlank(message = "组名称不能为空", groups = { SubmitGroupEditVG.class })
-    @Length(max = 10, message = "组名称长度不能超过10个字", groups = { SubmitGroupEditVG.class })
+    @Length(max = 20, message = "组名称长度不能超过20个字", groups = { SubmitGroupEditVG.class })
     private String groupName;
 
     @NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class })

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java

@@ -41,4 +41,9 @@ public class CreatedResultDTO implements Serializable {
 	 * （审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed）
 	 */
 	private String groupState;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -374,7 +374,7 @@ public class ResiGroupController {
     }
 
     /**
-     * 查询组详情
+     * 编辑小组信息-获取小组详情
      * @param form
      * @return
      */
@@ -386,7 +386,7 @@ public class ResiGroupController {
     }
 
     /**
-     * 提交小组信息编辑
+     * 编辑小组信息-提交编辑审核
      * @param form
      * @return
      */

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -101,7 +101,8 @@
             rg.GROUP_NAME AS groupName,
             rgs.TOTAL_MEMBERS AS totalMember,
             rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember,
-            rg.STATE AS groupState
+            rg.STATE AS groupState,
+            rg.GROUP_TYPE AS groupType
         FROM
             resi_group_member rgm
             LEFT JOIN resi_group rg ON ( rgm.RESI_GROUP_ID = rg.ID )