From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
index 04e4ac0..f8f9dbc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
@@ -1,15 +1,18 @@
package com.dy.pipIrrGlobal.pojoBa;
-
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import lombok.*;
-import java.io.Serializable;
-
-@TableName(autoResultMap = true)
+/**
+ * 鐢ㄦ埛涓庤鑹插叧绯诲疄浣�
+ */
+@TableName(value="ba_user_role", autoResultMap = true)
@Data
@Builder
@ToString
@@ -17,11 +20,14 @@
@AllArgsConstructor
public class BaUserRole implements BaseEntity {
- public static final long serialVersionUID = 202310211554001L;
+ public static final long serialVersionUID = 202311061942001L;
- @TableId(value = "userId", type = IdType.INPUT)
- public Long userId ;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "userId")
+ public Long userId;
- @TableId(value = "roleId", type = IdType.INPUT)
- public Long roleId ;
-}
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "roleId")
+ public Long roleId;
+
+}
\ No newline at end of file
--
Gitblit v1.8.0