Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

9 小时以前 43f9cf624b83c9d3d0e2280a1404dcc52695a18d

 src/main/java/com/zy/api/controller/KopenApiController.java

@@ -86,7 +86,7 @@
//        if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
//            return XSR.error("取消条件不能为空！！");
//        }
        return kopenApiService.getInDispatchResult(params);
        return kopenApiService.getInDispatchResult(params, null);
    }

    /**