From 151bc3c31c4c9913ce864ff65068cec2c5c614a3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 09:45:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index d6730a0..25a09a3 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -9,9 +9,10 @@
r.code reportCode,
i.code inspectionCode,
im.name materialName,
- r.conclusion ,
- r.status ,
+ r.conclusion,
+ r.status,
r.approver approver,
+ i.type,
check_time,
u.name
from lims_laboratory.report r
--
Gitblit v1.9.3