From 3c0ccc88ffa8a651ec78a611ffe75775222ebf07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 31 Jan 2024 17:05:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/entity/Divisor.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Divisor.java b/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
index a721a76..51afa1b 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Divisor.java
@@ -8,8 +8,6 @@
import java.util.Date;
-import javax.validation.constraints.NotNull;
-
import com.baomidou.mybatisplus.extension.activerecord.Model;
/**
@@ -22,15 +20,15 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-//@ApiModel(value="Divisor - Divisor������", description="Divisor - Divisor������")
+@ApiModel(value="Divisor - Divisor������", description="Divisor - Divisor������")
public class Divisor extends Model<Divisor> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "������")
private Integer id;
- @ApiModelProperty(value = "mac���")
- private String mac;
+ @ApiModelProperty(value = "������")
+ private String organizationId;
@ApiModelProperty(value = "pm2.5")
private String pm25;
@ApiModelProperty(value = "PM10")
@@ -53,4 +51,8 @@
private Date createTime;
@ApiModelProperty(value = "������������")
private Date updateTime;
+
+ private String createName;
+
+ private String updateName;
}
--
Gitblit v1.8.0