Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-23 6abb85bba678dee5d8aee82dbcd18758690402db

 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;


}