Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-05-09 8580866e175ad0050ee9c5ea3f757856fc242c39

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

@@ -17,4 +17,14 @@
     */
    Map<String, Object> query(@Param("companyId") Integer companyId, @Param("type") Integer type,
                              @Param("serverCarModelId") Integer serverCarModelId);
    
    
    
    /**
     * 获取价格
     * @param companyId
     * @param type
     * @return
     */
    Map<String, Object> query1(@Param("companyId") Integer companyId, @Param("type") Integer type);
}