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

2026-09-16 09:27:34 +08:00
parent 8c992183e3 b05c4d33db
commit 9d70d4c25e
2 changed files with 18 additions and 11 deletions
@@ -77,7 +77,7 @@ public class ZYJXJHBServiceImpl implements ZYJXJHBService {
        if (ty != null) {
            wrapper.eq(ZYJXJHB::getTy, ty);
        }
-        wrapper.orderByAsc(ZYJXJHB::getZydh);
+        wrapper.orderByDesc(ZYJXJHB::getQysj).orderByAsc(ZYJXJHB::getZydh);
        Page<ZYJXJHB> result = zyjxjhbMapper.selectPage(page, wrapper);
        return new PageResult<>(result.getRecords(), result.getTotal(),
                query.getPageNum(), query.getPageSize());