From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 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