From 6eb8f65d4a69a550945a92cc916d3c63dee739fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into qa
---
screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java b/screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java
index b24913d..408d308 100644
--- a/screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java
+++ b/screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java
@@ -9,7 +9,7 @@
/**
* <p>
- *
+ * ���������
* </p>
*
* @author moral
@@ -21,10 +21,19 @@
private static final long serialVersionUID = 1L;
+ /*
+ * ������mac
+ * */
private String mac;
+ /*
+ * ������
+ * */
private Date time;
+ /*
+ * ������
+ * */
private String value;
--
Gitblit v1.8.0