Merge remote-tracking branch 'origin/S7_master' into S7_master

zhoushihao

2025-06-16 88762bc89c4f60a756a8dc46a82f92dcbc415617

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/s7/entity/S7DataZKExtra.java

@@ -1,6 +1,6 @@
package com.mes.s7.entity;

import com.github.xingshuangs.iot.protocol.common.enums.EDataType;
import com.github.xingshuangs.iot.common.enums.EDataType;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable;
import lombok.Data;