From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突

---
 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java
index ca1ccc5..cd213ac 100644
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java
@@ -3,7 +3,7 @@
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
 import com.java110.fee.dao.IFeeDiscountRuleSpecServiceDao;
 import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;
 import com.java110.po.feeDiscountRuleSpec.FeeDiscountRuleSpecPo;

--
Gitblit v1.8.0