解决冲突

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

@@ -309,15 +309,10 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
 
-<<<<<<< HEAD
+
    @ApiImplicitParams({
            @ApiImplicitParam(value = "395",name = "apiId")
    })
-=======
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "395",name = "apiId")
-    })
->>>>>>> dev
     @PostMapping(value = "/getRestackInfoByResultId")
     public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
                                                   Integer pageNum,
@@ -377,19 +372,11 @@ public class WMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
     })
     public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
-<<<<<<< HEAD
-                                                           Integer apiId,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer inboundId
-                                                          ) {
-=======
-                                                          Integer apiId,
+                                             Integer apiId,
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer inboundId
     ) {
->>>>>>> dev
 
         return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
     }
@@ -715,17 +702,11 @@ public class WMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
     })
     public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
-<<<<<<< HEAD
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer apiId,
                                                           String con) {
-=======
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  String con) {
->>>>>>> dev
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }

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

@@ -26,17 +26,10 @@ public interface WMSFeign {
      */
     @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult",method = RequestMethod.POST)
     Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-<<<<<<< HEAD
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
                                       @RequestParam String con);
-=======
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam String con);
->>>>>>> dev
 
     /**
      * 展示出库实绩
@@ -178,17 +171,11 @@ public interface WMSFeign {
      */
     @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
     Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)Map<String,Object>mapval,
-<<<<<<< HEAD
                                                      @RequestParam Integer apiId,
                                                      @RequestParam Integer pageNum,
                                                      @RequestParam Integer pageSize,
                                                      @RequestParam String con);
-=======
-                                                 @RequestParam Integer apiId,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @RequestParam String con);
->>>>>>> dev
+
 
 
     /**
@@ -356,13 +343,10 @@ public interface WMSFeign {
      * @param mal
      * @return
      */
-<<<<<<< HEAD
+
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
-=======
-    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
-    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
->>>>>>> dev
+
 
 
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
@@ -396,11 +380,8 @@ public interface WMSFeign {
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
                                                    @RequestParam Integer inboundId
-<<<<<<< HEAD
                                                    );
-=======
-    );
->>>>>>> dev
+
     //根据物资信息查找暂存的垛位
     @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
     Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);