Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-19 f77d03b3d8bfd3d6cea7e011fc5f0086a4693daf

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

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

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


}