Merge branch 'dev_wx_msg' into dev_temp

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -241,7 +241,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                     jsonObject.put(WxmpMessageConstant.PAGE, resiPage.toString());
                 } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
                     StringBuilder govPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
-                    govPage.append("?customerId=").append(customerId).append("&userId=").append(userId);
+                    govPage.append("?customerId=").append(customerId).append("&staffId=").append(userId);
                     jsonObject.put(WxmpMessageConstant.PAGE, govPage.toString());
                 }
                 //开发环境

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -663,7 +663,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_CREATE_GROUP_BEHAVIOR);
-		wxSubscribeMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
+		wxSubscribeMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
 		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);