1、解决冲突

zhoushihao

2024-08-06 54aeb39206453ccfd2d1c89fe4f9def88b2c985c

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

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


}