Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-10-21 d184c245bfbe1847c56c5b88d67ee7bb51634860

 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;