diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
index 5eb7a06..978a3b4 100644
--- a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -12,11 +12,7 @@ import com.muyu.common.redis.service.RedisService;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.model.resp.CaptchaCodeResp;
 import com.muyu.gateway.service.ValidateCodeService;
-<<<<<<< HEAD
-import javax.annotation.Resource;
-=======
 import org.springframework.beans.factory.annotation.Autowired;
->>>>>>> 813460c (1..)
 import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
 
@@ -39,17 +35,10 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
     @Resource(name = "captchaProducerMath")
     private Producer captchaProducerMath;
 
-<<<<<<< HEAD
-    @Resource
-    private RedisService redisService;
-
-    @Resource
-=======
     @Autowired
     private RedisService redisService;
 
     @Autowired
->>>>>>> 813460c (1..)
     private CaptchaProperties captchaProperties;
 
     /**
@@ -61,11 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder()
                 .captchaEnabled(captchaEnabled);
         if (!captchaEnabled) {
-<<<<<<< HEAD
             return Result.success(respBuilder.build());
-=======
-            return Result.success(respBuilder);
->>>>>>> 813460c (1..)
         }
 
         // 保存验证码信息