Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -837,4 +837,8 @@ public class AMScontroller  extends BaseRESTfulController {
     Map<String,Object> addSerialNumber(@RequestBody Map<String,Object> map) {
         return amsFeign.getSerialNumber(map);
     }
+
+    @ApiOperation("批量审批运输单价")
+    @PostMapping("approvePriceData")
+    Map<String,Object> approvePriceData(@RequestBody Map<String,Object> map) {return amsFeign.approvePriceData(map);}
 }

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

@@ -305,4 +305,7 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/getSerialNumber")
     Map<String, Object> getSerialNumber(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransprices/approvePriceData")
+    Map<String, Object> approvePriceData(@RequestBody Map<String, Object> map);
+
 }

src/main/resources/application-dev.yml

@@ -24,23 +24,23 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:80}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.214:8093}
+    url: ${WMSFEIGN_URL:172.16.90.214:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:80}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:172.16.90.214:80}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+    url: ${SSOFEIGN_URL:172.16.90.214:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.214:80}
 
 
 #远程调用

src/main/resources/application-prod.yml

@@ -24,23 +24,23 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:80}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:80}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8096}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.202:9001}
+    url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:80}
 
 
 #远程调用