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/IGetFeeDiscountRuleBMO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/IGetFeeDiscountRuleBMO.java b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/IGetFeeDiscountRuleBMO.java
index a240981..2830a06 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/IGetFeeDiscountRuleBMO.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/IGetFeeDiscountRuleBMO.java
@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeDiscountRule;
-import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import org.springframework.http.ResponseEntity;
public interface IGetFeeDiscountRuleBMO {
--
Gitblit v1.8.0