diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index 272a8de..2e15d79 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; @RestController @Slf4j -@Api(tags = "商户管理") +@Api(tags = "商户支付管理") @RequestMapping("/merchant") public class MerchantController { diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java index 7bcebe5..7549978 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java @@ -3,7 +3,6 @@ package com.base.springcloud.service.imp; import com.base.springcloud.aspect.annotation.Rlock; import com.base.springcloud.bo.OrderBO; import com.base.springcloud.constant.PaymentConstant; -import com.base.springcloud.entity.MerchantConfig; import com.base.springcloud.entity.Order; import com.base.springcloud.service.*; import org.slf4j.Logger;