From d801ee292fb95592b3ed0eaa95d3b2506c78c9c1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 17 三月 2022 09:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/OrderMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 1232177..4e365e3 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -40,11 +40,11 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
+ <result column="wave_no" property="waveNo" />
</resultMap>
<update id="updateSettle">
- update man_order set settle = #{settle} where 1=1 and order_no = #{orderNo} and host_id = #{hostId}
+ update man_receive set settle = #{settle} where 1=1 and order_no = #{orderNo} and host_id = #{hostId}
</update>
<select id="getPage" resultMap="BaseResultMap">
--
Gitblit v1.9.1