Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 2a498d9f65f873cedb74ab5bcb48ad4b845d0622

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderRefusalController.java

@@ -64,7 +64,7 @@
    public Object list(String condition) {
        EntityWrapper<TOrderRefusal> wrapper = new EntityWrapper<>();
        if(StringUtils.hasLength(condition)){
            wrapper.eq("order_id",condition);
            wrapper.eq("driver_id",condition);
        }
        return tOrderRefusalService.selectList(wrapper);
    }