Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs...

luxiaotao1123

2020-08-24 a8ab74fdbc4e590a4c9778d447538c3bc30925e4

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

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