Merge remote-tracking branch 'origin/master'

wangfei

2024-11-08 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java

@@ -17,6 +17,10 @@
     */
    private Integer taskRunning;
    /**
     * 磨边前玻璃id
     */
    private String glassId;
    /**
     * 进片玻璃id
     */
    private String glassIdIn;