From 3d321d82df16121e1c21fb2113757e5a16de54a2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp
---
src/main/resources/mapper/TrayCodeMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/TrayCodeMapper.xml b/src/main/resources/mapper/TrayCodeMapper.xml
index 9e926f8..c959caa 100644
--- a/src/main/resources/mapper/TrayCodeMapper.xml
+++ b/src/main/resources/mapper/TrayCodeMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id" />
<result column="tray_no" property="trayNo" />
<result column="start" property="start" />
- <result column="end" property="end" />
+ <result column="finish" property="finish" />
<result column="memo" property="memo" />
<result column="modi_time" property="modiTime" />
<result column="modi_user" property="modiUser" />
--
Gitblit v1.9.1