Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/dto/TemperingLayoutDTO.java

@@ -22,4 +22,9 @@
     * 当前版图数量
     */
    private Integer count;

    /**
     * 当前版图占用格子数量
     */
    private Integer slotCount;
}