Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java

@@ -70,7 +70,7 @@
    /**
     * 人工下片数量
     */
    private Integer artificialNumber;
    private Integer otherNumber;


}