Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

3 天以前 16ee4f20dc68b9e6a19490c935aa17bb325f8f0d

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

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

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