From 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Tue, 04 Mar 2025 10:43:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage
---
hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
index b598e3f..eb0373a 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
@@ -20,6 +20,8 @@
<result property="threshold" column="threshold" />
<result property="productSn" column="product_sn" />
<result property="delFlag" column="del_flag" />
+ <result property="peculiarityType" column="peculiarity_type" />
+ <result property="peculiarityNumber" column="peculiarity_number" />
<result property="companyId" column="company_id" />
<result property="version" column="version" />
<result property="createBy" column="create_by" />
@@ -33,7 +35,7 @@
<sql id="selectHazmatBasicVo">
select a.id, a.name, a.cas, a.hazmat_type,a.min_package, a.kind,a.hazmat_character,a.supplier,a.manufacturer,a.hazmat_format,a.metering,
- a.unit,a.price,a.per_box,a.safe_num,a.threshold,a.product_sn,a.company_id,a.version, a.create_by, a.create_time,
+ a.unit,a.price,a.per_box,a.safe_num,a.threshold,a.product_sn,a.company_id,a.version,a.peculiarity_type,a.peculiarity_number, a.create_by, a.create_time,
a.update_by, a.update_time, a.remark,a.max_entry,b.name as company_name
from hz_hazmat_basic a
left join sys_company b on b.id=a.company_id
--
Gitblit v1.9.2