Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

 Conflicts:

	epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

	epmet-auth/deploy/docker-compose-prod.yml

	epmet-gateway/deploy/docker-compose-prod.yml

	epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml

	epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

	epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

	epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

	epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

	epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

	epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

	epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

	epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

	epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml

	epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml

	epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

	epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

	epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

	epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

	epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml

	epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml

	epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

	epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml

	epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml

	epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml

	epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

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

@@ -18,6 +18,7 @@
 package com.epmet.modules.member.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -57,6 +58,7 @@ public class ResiGroupMemberController {
 	 * @Date 2020/3/29 20:01
 	 **/
 	@PostMapping("applyjoingroup")
+	@NoRepeatSubmit
 	public Result applyJoinGroup(@LoginUser TokenDto tokenDto,
                                  @RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
 		applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
@@ -109,6 +111,7 @@ public class ResiGroupMemberController {
 	 * @Date 2020/3/30 22:07
 	 **/
 	@PostMapping("agreeapply")
+	@NoRepeatSubmit
 	public Result agreeApply(@LoginUser TokenDto tokenDto,
                              @RequestBody AgreeApplyFormDTO agreeApplyFormDTO) {
 		agreeApplyFormDTO.setUserId(tokenDto.getUserId());