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

mrzhssss

2022-01-15 9e328b797e1bf9109d0a2185045176ac61735c06

 src/main/java/zy/cloud/wms/manager/controller/CstmrController.java

@@ -41,7 +41,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
//        wrapper.orderBy("create_time",false);
        wrapper.orderBy("id",false);
        return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
    }