Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-04 5322ebe732e1cfb1abaf459edec03a6eab949cde

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java

@@ -40,7 +40,7 @@
    /**
     * 启用状态
     */
    private String enableState;
    private Integer enableState;

    /**
     * 剩余