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

Pu Zhibing

5 天以前 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63

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

@@ -14,5 +14,5 @@
     * @return
     */
    CancleOrder query(@Param("type") Integer type, @Param("orderType") Integer orderType,
                      @Param("companyId") Integer companyId);
                      @Param("openCityId") Integer openCityId);
}