From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java
index 8b0a0e2..e653461 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java
@@ -1,9 +1,10 @@
package com.panzhihua.service_user.model.dos;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,9 +19,9 @@
/**
* 用户id
*/
- private Long userId;
+ private Long userId;
/**
* 角色id
*/
- private Long roleId;
+ private Long roleId;
}
--
Gitblit v1.7.1