Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -69,7 +69,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     private static final String liuPiUrl = "http://172.16.33.122:44325/api/logistics/updateTareWeight";
 
-    private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
+    private static final String daXingUrl = "http://172.16.61.126:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
     private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16,23);

src/main/resources/com/steerinfo/dil/mapper/TmstruckTimeTaskResultMapper.xml

@@ -721,6 +721,7 @@
     OO.ORDER_NUMBER "orderNumber",
     TTTR.RESULT_VALUE AS "resultTime",
     AIR.REQUIREMENT_ESTIMATED_DURATION "planTimeDuration",
+    AIR.REQUIREMENT_NUMBER "requirementNumber",
     (CASE WHEN
      AIR.REQUIREMENT_ESTIMATED_DURATION is null
       then '未填写预计时长,无法比较'