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

王佳豪

2021-06-03 a1844a7fc934ca943db810b1bd2a450f948607cd

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

@@ -51,7 +51,7 @@
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("io_time", false);
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }