Merge remote-tracking branch 'origin/master'

wu

2024-10-15 865e425cdf7395fece0a53a6def75e2c84d6dbf0

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java

@@ -101,5 +101,8 @@
     */
    private Integer isSilkScreen;


    /**
     * 报工数量
     */
    private Integer reportCount;
}