4 Incheckningar ca489269d8 ... 1ae39c7d96

Upphovsman SHA1 Meddelande Datum
  zouzhd 1ae39c7d96 APP收货地址信息查看修改 3 år sedan
  luobang a795aac216 trak 3 år sedan
  luobang 8ad55eb384 Merge branch 'dev' 3 år sedan
  luobang e32e832d42 tijiao 3 år sedan

+ 3 - 3
src/main/resources/application-dev.yml

@@ -13,13 +13,13 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
 
 
 server:

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -3478,7 +3478,7 @@
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName"
+        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName"
 
         FROM
         OMSTRUCK_ORDER OO