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

---
 java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java
index a8d9230..e36d208 100644
--- a/java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java
@@ -1,7 +1,7 @@
 package com.java110.intf.fee;
 
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
 import com.java110.po.feeDiscountRuleSpec.FeeDiscountRuleSpecPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

--
Gitblit v1.8.0