Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

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

@@ -58,6 +58,11 @@
     */
    private Date updateTime;

    /**
     * 设备信息
     */
    private Integer deviceId;


}