Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PushOrderServiceImpl.java

@@ -25,7 +25,7 @@
     * @throws Exception
     */
    @Override
    public List<PushOrder> querys(Integer type, Integer pushType, Integer companyId) throws Exception {
        return pushOrderMapper.querys(type, pushType, companyId);
    public List<PushOrder> querys(Integer type, Integer pushType, Integer openCityId) throws Exception {
        return pushOrderMapper.querys(type, pushType, openCityId);
    }
}