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

Pu Zhibing

6 天以前 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java

@@ -24,7 +24,7 @@
     * @throws Exception
     */
    @Override
    public CancleOrder query(Integer type, Integer orderType, Integer companyId) throws Exception {
        return cancleOrderMapper.query(type, orderType, companyId);
    public CancleOrder query(Integer type, Integer orderType, Integer openCityId) throws Exception {
        return cancleOrderMapper.query(type, orderType, openCityId);
    }
}