From 12878263caa8d18860111d6f6900d495e9d9369c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 十二月 2024 14:40:34 +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/PermissionRole.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionRole.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionRole.java
index 8ab0432..eb80001 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionRole.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/PermissionRole.java
@@ -10,5 +10,4 @@
     private Integer id;
     private Integer roleId;
     private Integer permissionId;
-
 }

--
Gitblit v1.8.0