Merge remote-tracking branch 'origin/master'

wangfei

2024-12-19 268a9d6e7b1596abc9ac49ca9cf4b32e89998a9a

 hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/dto/FlowCardVirtualSlotDTO.java

@@ -15,6 +15,10 @@
     */
    private String flowCardId;
    /**
     * 层号
     */
    private Integer layer;
    /**
     * /*虚拟格子
     */
    private Integer virtualSlot;