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

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

@@ -88,4 +88,10 @@ public class ReportController {
                                       Integer pageSize){
         return reportFeign.getTransferOrderDetails(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value="查询发货四证")
+    @PostMapping(value = "/getSaleFourLicenceReport")
+    Map<String, Object> getSaleFourLicenceReport(@RequestBody(required=false) HashMap<String,Object> mapValue){
+        return reportFeign.getSaleFourLicenceReport(mapValue);
+    }
 }

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

@@ -38,4 +38,8 @@ public interface ReportFeign {
                                       @RequestParam Integer apiId,
                                       @RequestParam  Integer pageNum,
                                       @RequestParam  Integer pageSize);
+
+
+    @PostMapping(value = "api/v1/report/saleReports/getSaleFourLicenceReport")
+    Map<String, Object> getSaleFourLicenceReport(@RequestBody(required = false) HashMap<String, Object> map);
 }

src/main/resources/application-prod.yml

@@ -43,7 +43,8 @@ openfeign:
   WebSocketFeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:80}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8000}
+#    url: ${RMSFEIGN_URL:localhost:8055}
 
 
 #远程调用