From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/resources/mapper/ReportMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 63bc801..8c53688 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -11,6 +11,7 @@
         im.name materialName,
         r.conclusion ,
         r.status ,
+        r.approver approver,
         check_time,
         u.name
         from lims_laboratory.report r

--
Gitblit v1.9.3