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

IZCD4L12RTSW0VZ\Administrator

1 天以前 290e5fd2e74efe19326f56e38c3391aaae23ffc5

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

@@ -105,7 +105,8 @@
    public R query(String condition) {
        EntityWrapper<DocType> wrapper = new EntityWrapper<>();
        wrapper.like("doc_name", condition);
        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper);
        wrapper.eq("status", 1);
        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (DocType docType : page.getRecords()){
            Map<String, Object> map = new HashMap<>();