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/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java
index 76c1bdf..bc92234 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java
@@ -1,7 +1,7 @@
 package com.java110.fee.bmo.feeDiscountRule.impl;
 
-import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
 import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
 import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
 import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;

--
Gitblit v1.8.0