From 0404678803838f95af7b34ab6723ee210b2a8706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 10:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
index d5cbc2f..c3cf336 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -1,10 +1,15 @@
 package com.dy.pipIrrGlobal.pojoBa;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.po.BaseEntity;
 import lombok.*;
-
-@TableName(autoResultMap = true)
+/**
+ * 瑙掕壊涓庢潈闄愬叧绯诲疄浣�
+ */
+@TableName(value="ba_role_privilege", autoResultMap = true)
 @Data
 @Builder
 @ToString
@@ -14,8 +19,12 @@
 
     public static final long serialVersionUID = 202311062027001L;
 
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableField(value = "roleId")
     public Long roleId;
 
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableField(value = "privilegeId")
     public Long privilegeId;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0