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

zwl

昨天 0cb44badbe4d0d6b58c6324d29d3c7193be687f2

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

@@ -87,11 +87,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("manu_type")) {
                    wrapper.like(entry.getKey(), val);
                } else {
                    wrapper.eq(entry.getKey(), val);
                }
                wrapper.like(entry.getKey(), val);
            }
        }
    }