Merge branch 'feature-wm' into developer

# Conflicts:
#	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/out/impl/content/task/QywxGroupMsgTaskApiServiceImpl.java

@@ -360,7 +360,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
             SerializeConfig serializeConfig = new SerializeConfig();
             serializeConfig.setPropertyNamingStrategy(PropertyNamingStrategy.SnakeCase);
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderHoloBo, serializeConfig));
-            if (StringUtils.isNotBlank(orderHoloBo.getShareClerkId())) {
+            if (Objects.nonNull(orderHoloBo.getContentMaterialId())) {
                 TableSchema tableSchema = client.getTableSchema("tab_gic_cms_order");
                 Put temp = new Put(tableSchema);
                 for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {

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

@@ -161,11 +161,11 @@
     <dubbo:reference interface="com.gic.cloudimage.api.service.CloudVideoApiService" id="cloudVideoApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.enterprise.api.service.content.ValueAddedServicesOrderApiService" id="valueAddedServicesOrderApiService"
                      timeout="10000" retries="0" check="false"/>
-
-    <dubbo:reference id="dataIndexApiService" interface="com.gic.enterprise.api.service.data.DataIndexApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.content.api.service.ContentSettingApiService" id="contentSettingApiService"
                      timeout="10000" retries="0" check="false"/>
 
+    <dubbo:reference id="dataIndexApiService" interface="com.gic.enterprise.api.service.data.DataIndexApiService" timeout="10000" retries="0" check="false" />
+
 
     <dubbo:reference id="enterpriseChannelApiService" interface="com.gic.enterprise.api.service.EnterpriseChannelApiService" timeout="10000" retries="0" check="false"/>
 </beans>