Merge remote-tracking branch 'origin/master'

liujie

2023-08-16 5cb1979f05446792cc33a8cb6b7aaae906da5a70

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml

@@ -111,7 +111,7 @@
        a.estimatedMileage,
        a.estimatedTime,
        a.startPrice,
        a.waitTime,
        a.waitTime + a.outWaitTime as waitTime,
        a.actualMileage,
        a.state,
        (UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(a.startTime)) / 60 as travelTime