Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-24 b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1

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

@@ -102,7 +102,10 @@
        a.estimatedPrice,
        a.estimatedMileage,
        a.startPrice,
        a.state
        a.waitTime,
        a.actualMileage,
        a.state,
        (UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(a.startTime)) / 60 as travelTime
        from t_order a
        left join t_app_user b on (a.userId = b.id)
        where a.id = #{orderId}