解决冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -64,9 +64,10 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     private EquipmentOnCarMapper equipmentOnCarMapper;
     @Autowired
     private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
-
+    @Autowired
     JCSRemoteService jcsRemoteService;
 
+
     @Value("${fileserver_domain}")
     private String fileServer;