Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-11 0ff927605ae5df1cb63fbe6cb838c35da43be8ac

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

@@ -55,8 +55,13 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("io_type")) {
                    wrapper.eq(entry.getKey(), val);
                } else {
                wrapper.like(entry.getKey(), val);
            }

            }
        }
    }