Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

14 小时以前 79843611908e58f9538f8d8ebac62d3f0d01712c

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java

@@ -143,9 +143,9 @@
    @OperationLog("WCS任务上报通知")
    @PostMapping("/task/report")
    public R wcsTaskReport(@RequestBody TaskReportParam params) {
        if (params.getType() != 0){
            return wcsService.wcsTaskReport2(params);
        }
//        if (params.getType() != 0){
//            return wcsService.wcsTaskReport2(params);
//        }
        return wcsService.wcsTaskReport(params);
    }