From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 21 六月 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
index 69b4515..9823b84 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml
@@ -388,13 +388,15 @@
sr.safetynum,
sr.name,
sr.main_metering,
+ sr.productSn,
+ sr.cas,
bm1.meta_value reagent_unit,
bm2.meta_value reagent_type,
bm3.meta_value reagent_format,
bm4.meta_value product_home,
ss.meta_value as product_home_name,
- bm.meta_value as control_products_name,
- supplier.name as supplierName
+ bm.meta_value as control_products_name,
+ supplier.name as supplierName
from sys_reagent as sr
left join base_meta as ss on sr.product_home = ss.id
left join base_meta bm on bm.id = sr.control_products
--
Gitblit v1.9.2