From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityEquipment.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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..283e349 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
@@ -12,14 +12,12 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    //鎵�灞炵伅鏉�
-    private String belongTo;
+//    //鎵�灞炵伅鏉�
+//    private String belongTo;
     //姘磋川璁惧缂栫爜
     private String waterQualityEquipmentCode;
     //璁惧鐘舵��:鍦ㄧ嚎:1/绂荤嚎:0
     private int equipmentState;
     //鎺ュ叆鏃堕棿
     private LocalDateTime createTime;
-    //鎵�灞炰汉
-    private Long userId;
 }

--
Gitblit v1.9.3