luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java
This commit is contained in:
mi9688
2024-10-15 17:38:11 +08:00
parent d5fa35e6dd 128c884476
commit 7686e6253b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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