Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-19 f77d03b3d8bfd3d6cea7e011fc5f0086a4693daf

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

@@ -85,6 +85,10 @@
     * /*中空总次序
     */
    private Integer orderSort;
    /**
     * /*状态：表示配对的玻璃是否进笼，0未进笼 1已占用 2进笼完成
     */
    private Integer state;


}