Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

6 天以前 c3e47e5e70a9055b7d25c118eb1f7ec3c869e953

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

@@ -67,6 +67,7 @@
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.orderBy("modi_time",true);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }