修改冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -139,8 +139,6 @@ public class FireFightingSystemController extends AbstractBaseController {
     IEquipmentService iEquipmentService;
     @Autowired
     FireFightingSystemMapper fireFightingSystemMapper;
-    @Autowired
-    JcsFeign jcsFeign;
     
     @Value("${equipment.hierarchy}")
     private String hierarchy;