Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-08 435476e0f0162f8cdeda311937728c52c04ffbcb

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

@@ -40,7 +40,7 @@
    /**
     * 玻璃id
     */
    private Integer glassId;
    private String glassId;

    /**
     * 小片在格内的顺序