Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysIntegralMapper.java

@@ -6,5 +6,5 @@

public interface SysIntegralMapper extends BaseMapper<SysIntegral> {

    SysIntegral query(@Param("companyId") Integer companyId);
    SysIntegral query(@Param("openCityId") Integer openCityId);
}