From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java b/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java
index efa413c..1e36dba 100644
--- a/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java
+++ b/screen-api/src/main/java/com/moral/api/entity/HistoryHourly.java
@@ -1,22 +1,19 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
/**
- * <p>
- * ������������������
- * </p>
- *
- * @author moral
- * @since 2021-07-14
- */
+ * @ClassName HistoryHourly
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/9/14 8:53
+ * @Version TODO
+ **/
@Data
-@EqualsAndHashCode(callSuper = false)
public class HistoryHourly extends Model<HistoryHourly> {
private static final long serialVersionUID = 1L;
@@ -27,7 +24,7 @@
private String mac;
/**
- * ������������
+ * ������
*/
private Date time;
@@ -36,9 +33,9 @@
*/
private String value;
- /**
- * ������
- */
+ /*
+ * ���������
+ * */
private Integer version;
--
Gitblit v1.8.0