Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

tqs

2022-09-12 fdd8b1d79a9c899a0ad6dde6c17bef0a8488e6b0

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