From e180e151ee8369fcff917d878b3fb15b72d06d31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 二月 2023 18:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
index f2b1ab6..f465499 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
@@ -13,6 +13,9 @@
<result column="source" property="source" />
<result column="agentId" property="agentId" />
<result column="branchOfficeId" property="branchOfficeId" />
+ <result column="orderTakingTime" property="orderTakingTime"/>
+ <result column="goToAppointmentPointTime" property="goToAppointmentPointTime"/>
+ <result column="arrivalTimeAtTheAppointmentPoint" property="arrivalTimeAtTheAppointmentPoint"/>
<result column="startTime" property="startTime" />
<result column="startAddress" property="startAddress" />
<result column="startLat" property="startLat" />
@@ -46,9 +49,12 @@
<result column="payMoney" property="payMoney" />
<result column="discountedPrice" property="discountedPrice" />
<result column="couponId" property="couponId" />
+ <result column="discountAmount" property="discountAmount"/>
+ <result column="discount" property="discount"/>
<result column="payType" property="payType" />
<result column="payTime" property="payTime" />
<result column="hallOrder" property="hallOrder"/>
+ <result column="startWaitTime" property="startWaitTime"/>
<result column="state" property="state" />
<result column="oldState" property="oldState"/>
<result column="status" property="status" />
--
Gitblit v1.7.1