Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceRecord.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
 
 /**
  * 设备记录对象 iot_device_record
@@ -17,6 +18,7 @@ import lombok.experimental.Accessors;
  * @author zhangzhiyi
  * @date 2024-07-16
  */
+@SuperBuilder
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @Data

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java

@@ -2,7 +2,11 @@ package com.fastbee.iot.model;
 
 import com.fastbee.common.annotation.Excel;
 import com.fastbee.common.core.domain.BaseEntity;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * 设备记录对象 iot_device_record
@@ -10,6 +14,7 @@ import lombok.*;
  * @author zhangzhiyi
  * @date 2024-07-16
  */
+@SuperBuilder
 @EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor