Merge remote-tracking branch 'origin/dev' into dev

xuhy

4 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -70,7 +70,7 @@
    public void taskFiveMinute(){
        try {
            //处理未支付订单发送短信通知
            orderService.taskSmsSend();
//            orderService.taskSmsSend();
            for (Integer id: driverIds){
//                jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
            }