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

mrzhssss

2022-05-27 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be

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

@@ -61,7 +61,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                wrapper.eq(entry.getKey(), val);
            }
        }
    }