From 3a83e9a455b31eb5b80e4512617a9e58c75938d8 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Thu, 18 Jan 2024 15:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=AE=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java  | 9 +++++----
 .../src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java   | 5 +++++
 .../src/main/java/com/kms/yg/sz/domain/BsSgcSzJdsb.java  | 2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java
index 1c2abf47..79c301b8 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java
@@ -1,5 +1,6 @@
 package com.kms.yg.sz.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -53,10 +54,6 @@ public class BsSgcSzFxzz extends BaseEntity
     @ApiModelProperty("负责人类型")
     private String chargePersonType;
 
-    /** 成员 */
-    @Excel(name = "成员")
-    @ApiModelProperty("成员")
-    private String member;
 
     /** $column.columnComment */
     @Excel(name = "成员")
@@ -89,9 +86,13 @@ public class BsSgcSzFxzz extends BaseEntity
     private String relation;
 
 
+    @TableField("waga_name")
     private String sluiceName;
 
+    @TableField("waga_type")
     private String sluiceType;
 
+    private String wagaId;
+
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
index 8e966363..c1e5bc64 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java
@@ -1,6 +1,8 @@
 package com.kms.yg.sz.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -101,10 +103,13 @@ public class BsSgcSzFzr extends BaseEntity
     @ApiModelProperty("类型")
     private String type;
 
+    @TableField("waga_name")
     private String sluiceName;
 
+    @TableField("waga_type")
     private String sluiceType;
 
+    @TableField("waga_id")
     private String sluiceId;
 
     private String adcd;
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJdsb.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJdsb.java
index 15ebb236..0dfd5625 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJdsb.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzJdsb.java
@@ -1,5 +1,6 @@
 package com.kms.yg.sz.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.shuili.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +29,7 @@ public class BsSgcSzJdsb extends BaseEntity
     @ApiModelProperty("启闭设备")
     private String openingClosingEquipment;
 
+    @TableField("waga_id")
     private String sluiceId;
     /** 启闭机数量 */
     @Excel(name = "启闭机数量")