Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -467,7 +467,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                     }
                     ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
                     scmVehinspectItemDto.setVehInspectSid(resultBean1.getData());
-                    ResultBean resultBean = scmVehinspectItemFeign.saveItem(scmVehinspectItemDto);
+                    ResultBean resultBean = scmVehinspectItemFeign.save(scmVehinspectItemDto);
                     if (!resultBean.getSuccess()) {
                         return rb.setMsg("验车单业务模块的数据推送失败!");
                     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemDto.java

@@ -47,7 +47,7 @@ import java.util.List;
  * @since 1.0
  */
 @Data
-@ApiModel(value = "验车单中的检查表项目 数据传输对象", description = "验车单中的检查表项目 数据传输对象")
+@ApiModel(value = "推送验车检查表")
 public class ScmVehinspectItemDto implements Dto {
 
     private static final long serialVersionUID = 4815903953419395568L;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java

@@ -62,11 +62,6 @@ public interface ScmVehinspectItemFeign {
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehinspectItemDto dto);
 
-    @ApiOperation("推送验车单数据")
-    @PostMapping("/saveItem")
-    @ResponseBody
-    public ResultBean saveItem(@RequestBody ScmVehinspectItemDto dto);
-
     /**
      * Pc端根据验车单sid初始化车辆检查表
      *

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java

@@ -54,11 +54,6 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign {
         return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehinspectitem/save无法访问");
     }
 
-    @Override
-    public ResultBean saveItem(ScmVehinspectItemDto dto) {
-        return null;
-    }
-
     @Override
     public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
         return null;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java

@@ -65,11 +65,6 @@ public class ScmVehinspectItemRest implements ScmVehinspectItemFeign {
         return scmVehinspectItemService.saveItem(dto);
     }
 
-    @Override
-    public ResultBean saveItem(ScmVehinspectItemDto dto) {
-        return scmVehinspectItemService.saveItem(dto);
-    }
-
     @Override
     public ResultBean<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
         ResultBean rb = ResultBean.fireFail();