Merge remote-tracking branch 'origin/developer-2023-02-15' into test_branch

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/TransferActiveCodeDTO.java

@@ -74,7 +74,7 @@ public class TransferActiveCodeDTO implements Serializable {
                 Map<String, String> stringMap = this.failedList.get(i - 1);
                 log.append(i+".（转移成员："+stringMap.get("handoverStaffName")+"，接收成员："+stringMap.get("takeoverStaffName")+"，失败原因错误码："+stringMap.get("errorCode")+"）；");
             }
-            //去掉末尾的分号
+            //去掉末尾分号
             String substring = log.substring(0, log.toString().length() - 1);
             return substring;
         }

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

@@ -124,6 +124,6 @@
     <dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/>
 
 
-    <dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" />
+<!--    <dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" />-->
 
 </beans>