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

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

@@ -165,11 +165,13 @@ public class TMSController extends BaseRESTfulController {
      */
     @PostMapping("getShipLocationList")
     @ApiOperation(value = "展示位置作业")
-    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue) {
+    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   String con
+                                                   ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue);
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue,con);
     }
 
     @PostMapping("getShipLocation/{locationId}")

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

@@ -177,7 +177,9 @@ public interface TmsshipFeign {
                                             @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
-    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue);
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam String con
+                                            );
 
 
     /**