boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
#	yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java
This commit is contained in:
顾君禹
2025-08-14 15:02:38 +08:00
parent e75b5ae325 7996fd5cb5
commit 882a7a8f33
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
View File

@@ -2,7 +2,8 @@ package cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -10,6 +11,7 @@ import java.time.LocalDateTime;
@Data @Data
public class DeviceInfoSaveReqVO { public class DeviceInfoSaveReqVO {
private String id; private String id;
@Schema(description = "设备全局唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "9620") @Schema(description = "设备全局唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "9620")
private String deviceUniqueId; private String deviceUniqueId;

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/deviceinfo/DeviceInfoDO.java
View File

@@ -24,6 +24,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class DeviceInfoDO extends BaseDO { public class DeviceInfoDO extends BaseDO {
private String id; private String id;
/** /**
* 设备全局唯一标识 * 设备全局唯一标识
@@ -156,4 +157,4 @@ public class DeviceInfoDO extends BaseDO {
private String plotName; private String plotName;
private String tenantId; private String tenantId;
} }