From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
index 1570d83..590df42 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java
@@ -3,6 +3,7 @@
import lombok.Data;
import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
/**
* @author ZZQ
@@ -16,12 +17,33 @@
private String c3Mac = "";
//鍏呯數閲�
-
-// @NotEmpty(message = "鍏呯數閲忎笉鑳戒负绌�")
private Integer chargingCapacity;
//鍏呯數閲戦
-
-// @NotEmpty(message = "鍏呯數閲戦涓嶈兘涓虹┖")
private Double chargeAmount;
+
+ //璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級
+ private int time;
+
+ //璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
+ private String constant = "BC64";
+
+ //璁剧疆鍦板潃
+ private String address;
+
+ //骞�
+ private int year;
+ //鏈�
+ private int month;
+ //鏃�
+ private int day;
+ //鏃�
+ private int hour;
+ //鍒�
+ private int min;
+ //绉�
+ private int sec;
+
+ //C3鍏呯數妗╄〃鏌ヨ鍏抽敭瀛�
+ private String keyword;
}
--
Gitblit v1.9.3