From 2de45155f323dd5371e9bb7432bd94b742d5cb77 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 24 十二月 2021 18:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java
index edc808b..4170193 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java
@@ -20,6 +20,4 @@
     private int equipmentState;
     //鎺ュ叆鏃堕棿
     private LocalDateTime createTime;
-    //鎵�灞炰汉
-    private Long userId;
 }

--
Gitblit v1.9.3