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

IZCD4L12RTSW0VZ\Administrator

2 天以前 c8712bbf027d7c3db9c33f8b015abed1473d06a7

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