Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-20 189c02d514d360290bdb59b95f7120e6a418867c

Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
#	src/main/java/com/zy/asrs/controller/MatCodeController.java
#	src/main/java/com/zy/asrs/utils/VersionUtils.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
#	src/main/resources/application.yml

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

@@ -35,7 +35,9 @@
                     @RequestParam(defaultValue = "10")Integer limit,
                     @RequestParam(required = false)Long parentId){
        EntityWrapper<Tag> wrapper = new EntityWrapper<>();
        if(!Cools.isEmpty(parentId)) {
        wrapper.eq("parent_id", parentId==null?getOriginTag().getId():parentId);
        }
        wrapper.orderBy("sort");
        List<Tag> tags = tagService.selectList(wrapper);
        return R.ok().add(tags);