From 79570c017c73b1d3ca2d701348257275d9587875 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 26 十二月 2023 11:39:03 +0800
Subject: [PATCH] 2023-12-26 朱宝民 县镇村获取接口、用水方式获取接口、农户增加虚拟卡号和用水方式

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index bb7bf2a..ed531ba 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -55,6 +55,12 @@
     @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     public Long id;
 
+
+    @Schema(description = "鎵�灞炵墖鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableField(value = "blockId")
+    public Long blockId ;
+
     /**
      * 鐢ㄦ埛濮撳悕
      */
@@ -87,6 +93,7 @@
     /**
      * 鏄惁瓒呯骇绠$悊鍛� 1:鏄�,0:鍚�
      */
+    @Schema(hidden = true)
     @TableField(value = "supperAdmin")
     @JSONField(serialize = false)
     public Byte supperAdmin;
@@ -105,21 +112,31 @@
 
 
     /**
+     * 鐢ㄦ埛鎵�灞炶鑹睮d
+     */
+    @Schema(description = "鎵�褰掕鑹诧紙鎵�灞炶鑹睮D瀛楃涓叉暟缁勶級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @TableField(exist = false)
+    public String[] roleIds ;
+
+    /**
      * 鐢ㄦ埛鎵�灞炶鑹�
      */
+    @Schema(description = "鎵�褰掕鑹插垪琛紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ~鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @TableField(exist = false)
     public List<?> roleList ;
 
     /**
-     * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
+     * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
      */
+    @Schema(hidden = true)
     @TableField(exist = false)
+    @JSONField(serialize = false)
     public List<Integer> privileges;
-    //public transient List<Integer> privileges;//姝ょ鏂瑰紡鍙橀噺涓嶅瓨搴擄紝 涔熶笉鍙備笌搴忓垪鍖栦簡
 
     /**
-     * 鐢ㄦ埛鎵�灞炶鑹睮d
+     * 鎵�灞炵墖鍖哄悕绉�
      */
+    @Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ~鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @TableField(exist = false)
-    public String[] roleIds ;
+    public String blockName ;
 }
\ No newline at end of file

--
Gitblit v1.8.0