From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
index f6aad09..d613f1b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
@@ -3,27 +3,37 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
 
 @Data
 public class LEDProgramParam {
 
 
-
     private Long id;
 
-    @NotNull
+    @NotNull(message = "鑺傜洰鍚嶇О涓嶈兘涓虹┖")
     private String name;
 
-    @NotNull
-    private Integer kind;
+    /**
+     * 棰勮鍥�
+     */
+    private String previewUrl;
 
-    /*澶у皬*/
-    private Double size;
+    /**
+     * 鑺傜洰瀹�
+     */
+    private Integer width;
 
-    /*灏哄*/
-    private String pixel;
+    /**
+     * 鑺傜洰楂�
+     */
+    private Integer height;
 
+    /**
+     * pages瀹炰綋
+     */
+    private List<Map> pages;
 
-    private String programUrl;
 
 }

--
Gitblit v1.9.3