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

zhou zhou

16 小时以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 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);
    }