Merge branch 'develop_dl_3.6.0.6' into develop_dl_plan6

# Conflicts: # amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java # amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java # amos-boot-system-equip/src/main/resources/application-dev.properties

Merge branch 'develop_dl_3.6.0.6' into develop_dl_plan6
ced5d28e · tianyiming · 9d086695 · 81fee096 · ced5d28e
Commit ced5d28e authored Dec 07, 2022 by tianyiming
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

EquipmentManageServiceImpl.java .../equipmanage/service/impl/EquipmentManageServiceImpl.java +0 -2

No files found.
--- a/amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
+++ b/amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
@@ -40,8 +40,6 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
    @Autowired
    EquipmentManageMapper equipmentManageMapper;

-    @Autowired
-    EquipmentCategoryController equipmentCategoryController;

    @Autowired
    private RemoteSecurityService remoteSecurityService;