feat：代码合并冲突

fs-company/src/main/java/com/fs/company/controller/common/CommonController.java

@@ -67,8 +67,8 @@ public class CommonController
 
     @Autowired
     private QwApiService qwApiService;
-    @Autowired
-    private ITencentCloudCosService tencentCloudCosService;
+//    @Autowired
+//    private ITencentCloudCosService tencentCloudCosService;
 
 
     @Autowired