From b74d3f3e8cfece410031916d18b9ebccb0aba731 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 03 七月 2024 13:04:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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