Merge branch 'ljl1216' into 'master'

fix: 设备枚举类型数据丢失

See merge request huang/thingsboard3.3.2!13

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceCredentialsEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
@@ -23,14 +24,16 @@ public class YtDevice extends TenantBaseEntity {
   private JsonNode deviceInfo;
 
   private LocalDateTime activeTime;
-  private String deviceState;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private DeviceState deviceState;
   private String profileId;
   private String deviceToken;
   private String tbDeviceId;
   private String deviceTypeId;
   private LocalDateTime lastConnectTime;
   private String label;
-  private String deviceType;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private DeviceTypeEnum deviceType;
 //  private DeviceCredentialsEnum deviceCredentials;
   private String organizationId;
   /** 告警状态：0：正常 1：告警 */