From 4ec08cdfd39c2407733c65b64e63cedabc885bca Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 10:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3ChargingParam.java | 11 +++++++----
1 files changed, 7 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..82bd80d 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,14 @@
private String c3Mac = "";
//鍏呯數閲�
-
-// @NotEmpty(message = "鍏呯數閲忎笉鑳戒负绌�")
private Integer chargingCapacity;
//鍏呯數閲戦
-
-// @NotEmpty(message = "鍏呯數閲戦涓嶈兘涓虹┖")
private Double chargeAmount;
+
+ //璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級
+ private int time;
+
+ //璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
+ private String constant = "BC64";
}
--
Gitblit v1.9.3