From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml b/gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml
index 2cf06ac..4daa8b1 100644
--- a/gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml
+++ b/gc-sys/src/main/resources/mapper/system/SysEnvironmentalInfoMapper.xml
@@ -78,7 +78,7 @@
<select id="queryOperaIteml" parameterType="com.xzx.gc.model.admin.ItemModel"
resultType="com.xzx.gc.model.admin.ItemModel">
- select a.id,a.title,a.del_flag as delFlag,a.show_flag as showFlag,a.item_unit as itemUnit,
+ select a.id,a.title,a.del_flag as delFlag,a.show_flag as showFlag,a.item_unit as itemUnit,a.min_price minPrice,a.max_price maxPrice,
(select b.title from xzx_sys_environmental_info b where b.id=a.parent_id) as type,
a.price as price,a.second_price as secondPrice,IFNULL(a.put_storage_price,0.00) as putStoragePrice,a.sort as
sort,
@@ -115,7 +115,7 @@
<select id="queryOperateItemList" parameterType="com.xzx.gc.model.admin.ItemModel"
resultType="com.xzx.gc.model.admin.ItemModel">
- select a.id,a.title,a.sort,a.item_type,a.city_id,a.partner_id,a.del_flag,
+ select a.id,a.title,a.sort,a.item_type,a.city_id,a.partner_id,a.del_flag,a.min_price minPrice,a.max_price maxPrice,
(select b.partner_name from xzx_city_partner b where a.partner_id=b.id) as partnerName
from xzx_sys_environmental_info a where 1=1
<if test="id!= null and id != ''">
--
Gitblit v1.9.1