Merge remote-tracking branch 'origin/feature/社群' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java
	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

@@ -81,7 +81,7 @@ public class QywxSendServiceImpl implements QywxSendService {
     public ServiceResponse<String> sendMessageShare(String wxEnterpriseId, String staffId, List<String> extendUserList,
             List<ContentMaterialDTO> imageList, String message) {
         List<String> materialIdList = this.materialService.getImageMediaId(wxEnterpriseId, imageList, 1);
-        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, message, 2, null);
+        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, message, 2,null);
     }
 
     // 群发发送
@@ -94,7 +94,7 @@ public class QywxSendServiceImpl implements QywxSendService {
         }
         // 群发请求参数
         QywxExternalMessageDTO messageDTO = this.getMessage(from, message, materialIdList,chatType);
-        log.info("群发信息={}",JSON.toJSONString(messageDTO));
+        log.info("群发信息={}",JSON.toJSONString(messageDTO));
         if (messageDTO.getAttachments().isEmpty() && StringUtils.isBlank(messageDTO.getContent())) {
             log.info("群发素材不存在, 群发创建失败");
             return ServiceResponse.failure("9999", "群发素材不存在, 群发创建失败");

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -116,12 +116,11 @@
 
     <dubbo:reference interface="com.gic.marketing.pro.api.service.offline.OfflinePreApiService" id="offlinePreApiService" timeout="10000" retries="0" check="false"/>
 
+	<dubbo:reference interface="com.gic.enterprise.api.service.AccountService" id="accountService"/>
 
     <dubbo:reference interface="com.gic.content.api.service.ContentColumnApiService" id="contentColumnApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialShareApiService" id="contentMaterialShareApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/>
 
-	<dubbo:reference interface="com.gic.enterprise.api.service.AccountService" id="accountService"/>
-
 </beans>