代码冲突

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -286,10 +286,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     private AddressFeign addressFeign;
 
 
-
-    @Autowired
-    private LoadAppConfig loadAppConfig;
-
     @Autowired
     private PerformanceSmartCompanyNoConfig companyNoConfig;
 
@@ -1830,7 +1826,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @return
      */
     private SuperviseInfo getSuperviseInfo(String orderNo, int type) {
-        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode());//对接马上来供应链配置信息//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())
@@ -3796,7 +3792,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @return
      */
     public List<WeighingSignatureDto> getWeighingSignature(String childNo){
-        App app = loadAppConfig.getApp(AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode());//对接场站配置信息
+        App app = appConfig.getApp(AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode());//对接场站配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
                 .setAppId(app.getAppNo())