Merge remote-tracking branch 'origin/master'

src/main/java/cn/van/business/util/JDUtils.java

@@ -22,6 +22,7 @@ import com.jd.open.api.sdk.response.kplunion.UnionOpenOrderRowQueryResponse;
 import com.jd.open.api.sdk.response.kplunion.UnionOpenPromotionCommonGetResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.SetOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -67,9 +68,9 @@ public class JDUtils {
     private static final Logger logger = LoggerFactory.getLogger(JDUtils.class);
 
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-    @Resource
+    @Autowired
     private StringRedisTemplate redisTemplate;
-    @Resource
+    @Autowired
     private OrderRowRepository orderRowRepository;
     @Resource
     private WXUtil wxUtil;