From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

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