Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-19 f77d03b3d8bfd3d6cea7e011fc5f0086a4693daf

 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;