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

whycq

2024-07-05 010dc23827d3b1020356b6741ec47f7ce81497ab

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

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