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

lsh

17 小时以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

@@ -42,7 +42,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderBy("create_time", false);
        } else {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
    }