Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

luxiaotao1123

2022-04-02 c61be765fe40fce1a57471a8fc8b93932c0a970c

 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);
            }
        }
    }