Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-21 f6f4e7beea525f0c450d618fdc93f112c6813edc

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

@@ -11,10 +11,10 @@

    /**
     * 获取价格
     * @param companyId
     * @param systemPriceCityId
     * @param type
     * @return
     */
    Map<String, Object> query(@Param("companyId") Integer companyId, @Param("type") Integer type,
    Map<String, Object> query(@Param("systemPriceCityId") Integer systemPriceCityId, @Param("type") Integer type,
                              @Param("serverCarModelId") Integer serverCarModelId);
}