From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml
index e26f43a..b63c207 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml
@@ -18,9 +18,10 @@
     <!-- 鏌ヨ璐圭敤鎶樻墸瑙勫垯淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getFeeDiscountRuleInfo" parameterType="Map" resultType="Map">
         select t.rule_name,t.rule_name ruleName,t.remark,t.status_cd,t.status_cd statusCd,t.rule_id,t.rule_id
-        ruleId,t.bean_impl,t.bean_impl beanImpl,t.discount_type discountType
+        ruleId,t.bean_impl,t.bean_impl beanImpl,t.discount_type discountType,t.discount_small_type ,
+        t.discount_small_type discountSmallType
         from fee_discount_rule t
-        where 1 =1
+        where 1 = 1
         <if test="ruleName !=null and ruleName != ''">
             and t.rule_name= #{ruleName}
         </if>
@@ -39,6 +40,9 @@
         <if test="discountType !=null and discountType != ''">
             and t.discount_type= #{discountType}
         </if>
+        <if test="discountSmallType !=null and discountSmallType != ''">
+            and t.discount_small_type= #{discountSmallType}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

--
Gitblit v1.8.0