Merge branch 'jsxswms' into integrationWms

zhang

3 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

 src/main/java/com/zy/asrs/controller/BasCrnStatusController.java

@@ -111,7 +111,7 @@
    public R query(String condition) {
        EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
        wrapper.like("sts_desc", condition);
        Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 100), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasCrnStatus basCrnStatus : page.getRecords()){
            Map<String, Object> map = new HashMap<>();