Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 2e3407d0b46a6e2e75f8cf14cce73f8e0ba2051e

 src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java

@@ -65,7 +65,6 @@
        EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
        Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
        wrapper.eq("remove", 0);
        wrapper.eq("is_carriers",1);
        wrapper.eq("company_id",id);
        if (ToolUtil.isNotEmpty(name)) {
            wrapper.like("driver_name", name).or().like("account", name);