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/discount/impl/VacantHousingDiscountImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java b/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
index da645b4..d53891f 100644
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
@@ -4,7 +4,7 @@
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.feeDiscount.ComputeDiscountDto;
 import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
 import com.java110.fee.discount.IComputeDiscount;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;

--
Gitblit v1.8.0