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

18516761980

2022-06-16 a0dc6d318064e45557bf2426a8f3064dbd23d93e

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

@@ -39,6 +39,7 @@
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
        wrapper.orderBy("type_no",true);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));