From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 7e17cfa..88e512e 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -26,11 +26,12 @@
specifications_models specifications,
unit,
quantity num,
+ surveyor,
+ type,
DATE_FORMAT(inspection_date, '%Y-%m-%d') startTime,
DATE_FORMAT(date_survey, '%Y-%m-%d') endTime,
DATE_FORMAT(create_time, '%Y-%m-%d') formTime
from lims_laboratory.raw_material
where state = 1
- and type = 0
</select>
</mapper>
--
Gitblit v1.9.3