Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

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

@@ -73,6 +73,8 @@
        allLike(LocNormal.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("appe_time", false);
        }
        if (Cools.isEmpty(param.get("state"))) {
            wrapper.in("state", "1,2");