From fcc929fa2888c6b06a168f1ca84344e3bf9fdce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 11:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/Role.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/Role.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/Role.java
index 6f7ecf1..03b49ac 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/Role.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/Role.java
@@ -7,6 +7,6 @@
 @Data
 public class Role {
     @TableId(type = IdType.AUTO)
-    private String id;
+    private Integer id;
     private String role;
 }

--
Gitblit v1.8.0