From da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 三月 2022 15:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java
index bff7532..0d55afc 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java
@@ -5,6 +5,6 @@
 @Data
 public class LampCount {
 
-    private Integer id;
+    private Long id;
     private Integer count;
 }

--
Gitblit v1.9.3