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

zwl

1 天以前 6cfcd3471b380c483ab06c709c028eb94ba2a2b2

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

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