From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index e40fc42..fd9639c
--- a/java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml
@@ -20,8 +20,9 @@
select t.discount_name,t.discount_name discountName,t.discount_desc,t.discount_desc
discountDesc,t.discount_type,t.discount_type discountType,t.status_cd,t.status_cd
statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id communityId,t.rule_id,t.rule_id
- ruleId
+ ruleId,t.create_time createTime,fdr.rule_name ruleName,fdr.bean_impl beanImpl
from fee_discount t
+ left join fee_discount_rule fdr on t.rule_id = fdr.rule_id and fdr.status_cd = '0'
where 1 =1
<if test="discountName !=null and discountName != ''">
and t.discount_name= #{discountName}
--
Gitblit v1.8.0