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

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/TMSController.java
#	src/main/java/com/steerinfo/dil/feign/TmsFeign.java

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

@@ -159,7 +159,11 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
+<<<<<<< HEAD
     @ApiOperation(value = "计时")
+=======
+    @ApiOperation(value="计时")
+>>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @RequestLimit()
     @PostMapping(value = "/startend")
@@ -180,7 +184,11 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "修改计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/tmstimingresultsUpdate")
+<<<<<<< HEAD
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"修改计时"})
+=======
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"修改计时"})
+>>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     public Map<String, Object> tmstimingresultsUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.tmstimingresultsUpdate(map);
     }

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

@@ -74,21 +74,36 @@ public interface TmsFeign {
 
 
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
+<<<<<<< HEAD
     Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
+=======
+    Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
+                                             @RequestParam  Integer pageNum,
+                                             @RequestParam  Integer pageSize);
+
+>>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
 
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
     Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+<<<<<<< HEAD
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize);
 
 
+=======
+                                          @RequestParam  Integer apiId,
+                                          @RequestParam  Integer pageNum,
+                                          @RequestParam  Integer pageSize);
+
+
+>>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
     Map<String, Object> syncQualityResult(Map<String, Object> map);
 
@@ -193,7 +208,10 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/changeSaleTransOrder")
     Map<String, Object> changeSaleTransOrder(Map<String, Object> map);
+<<<<<<< HEAD
 
+=======
+>>>>>>> 1ae397577949f50ad9b020e41b0742172116bf79
 }