Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

zjj

2024-09-03 e1c7f150792a5085dd64e86e6af82820ab34dc05

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

@@ -49,7 +49,7 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
    }