From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java
index 643ea67..1a9c682 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Data
@@ -15,16 +16,13 @@
     @NotEmpty
     private String address;
 
-
-    private String macCode;
+    @NotNull(message = "璁惧绫诲瀷涓嶈兘涓虹┖")
+    private Integer deviceType;   //  0 铏氭嫙鐏潌   1 瀹炰綋鐏潌
 
 
-    private Integer state;
+    // private String macCode;
 
-    /*鐏潌ID*/
-    private String lampId;
-
-
+    
     /*鎵�灞炲鎴�*/
     private String belongsClient;
 

--
Gitblit v1.9.3