From 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 17:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index e1188f1..69e1e5f 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -18,6 +18,8 @@
                d.collect_url,
                d.storage_url,
                d.ip,
+            d.mdb_entrust_code,
+            d.mdb_sample_code,
                ip.inspection_item,
                if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
                   ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass,

--
Gitblit v1.9.3