From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs
---
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