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

zhou zhou

2 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

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

@@ -43,6 +43,7 @@
        convert(param, wrapper);
        allLike(TaskLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("appe_time desc");
        return R.ok(taskLogService.selectPage(new Page<>(curr, limit), wrapper));
    }