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

LSH

2023-12-27 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2

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

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