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

admin

2021-08-27 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b

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

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