Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

zjj

2024-11-14 a22208471156a57fc52f000d4184d6c628ac6496

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

@@ -41,6 +41,7 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("wrk_sts",true);
        return R.ok(wrkMastStaService.selectPage(new Page<>(curr, limit), wrapper));
    }