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

skyouc

2 天以前 fe8d6e225812fee9723a3a942481fdaf171a9dbc

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

    /**