Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

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

@@ -15,5 +15,5 @@
     * @return
     * @throws Exception
     */
    List<PushOrder> querys(Integer type, Integer pushType, Integer companyId) throws Exception;
    List<PushOrder> querys(Integer type, Integer pushType, Integer openCityId) throws Exception;
}