Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java

@@ -51,7 +51,7 @@ public class DingInfoPullController {
 
     private final ProcDefManage procDefManage;
 
-    @Resource(name = "refreshToken")
+    @Resource
     private IRefreshTokenService refreshTokenService;
 
     @Value("${irs.interface-refresh.request-token-url}")

pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java

@@ -73,7 +73,7 @@ public class AppIrsManage {
 
     @Value("${irs.search-app.url}")
     private String searchUrl;
-    @Resource(name = "refreshToken")
+    @Resource
     private IRefreshTokenService refreshTokenService;
 
     @Value("${irs.interface-refresh.request-token-url}")

pmapi/src/main/java/com/ningdatech/pmapi/provincial/service/impl/JoinReviewProvincialBureauServiceImpl.java

@@ -50,7 +50,7 @@ public class JoinReviewProvincialBureauServiceImpl implements IJoinReviewProvinc
     @Autowired
     private RestTemplate restTemplate;
 
-    @Resource(name = "refreshToken")
+    @Resource
     private IRefreshTokenService refreshTokenService;
 
     @Value("${irs.interface-refresh.request-token-url}")

pmapi/src/test/java/com/ningdatech/pmapi/irs/irsTest3.java

@@ -24,7 +24,7 @@ import java.util.Objects;
 @Slf4j
 public class irsTest3 extends AppTests {
 
-    @Resource(name = "refreshToken")
+    @Resource
     private IRefreshTokenService refreshTokenService;
 
     @Value("${irs.interface-local-refresh.request-token-url}")