Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

18516761980

2022-05-30 67a1d9c58a5a927d544e0cfbfa8ca14fbd78c49d

 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));
    }