Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1164,7 +1164,7 @@ public interface AmsFeign {
 //                                                      @RequestParam Integer apiId,
 //                                                      @RequestParam String con) ;
 
-    @PostMapping("/api/v1销售/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                       @RequestParam Integer pageNum,
                                                       @RequestParam Integer pageSize,

src/main/resources/bootstrap.yml

@@ -77,8 +77,6 @@ openfeign:
 #  RmsFeign:
 #    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
-
-
 genxml:
   pth: com/a
 cache:

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

@@ -584,7 +584,7 @@
     </select>
 
 <!--  通过运输订单号查询订单类型和ID  -->
-    <select id="getOrderMesByOrderId" parameterType="string" resultType="java.util.Map">
+    <select id="getOrderMesByOrderNumber" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_ID "orderId",
                OO.ORDER_TYPE "orderType"
         from OMSTRUCK_ORDER OO