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

zwl

昨天 0cb44badbe4d0d6b58c6324d29d3c7193be687f2

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

@@ -210,7 +210,7 @@
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                    wrapper.like("loc_no", String.valueOf(entry.getValue()));
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }