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

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

@@ -699,11 +699,12 @@ public class BMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  String startTime,
                                                  String endTime,
-                                                      Integer feeType){
+                                                      Integer feeType,
+                                                      String con){
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
-        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime);
+        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime,con);
     }
 
     /**

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

@@ -285,7 +285,8 @@ public interface BmsshipFeign {
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("startTime") String startTime,
                                                 @RequestParam("feeType")Integer feeType,
-                                                @RequestParam("endTime") String endTime);
+                                                @RequestParam("endTime") String endTime,
+                                                @RequestParam("con") String con);
 
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
     Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  path: C:\Users\24390\Desktop\work\a
-#  path: /shared
+  #path: C:\Users\24390\Desktop\work\a
+  path: /shared
 server:
   port: 8080