Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

23 小时以前 1d1b053456773c63e51505c8f1be819c0edb2b92

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

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