From 63c6a5af5ef04baf3757069ed07f3a2ce275bb76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 24 Sep 2024 19:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/salaryoptconfig.xml          | 62 ++++++++-----------
 .../salary/entity/auth/po/AuthRolePO.java     |  2 +-
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml
index 9e3d53351..c986b7a83 100644
--- a/resource/WEB-INF/salaryoptconfig.xml
+++ b/resource/WEB-INF/salaryoptconfig.xml
@@ -2,42 +2,7 @@
 
 <config name="н³ê¹ÜÀíȨÏÞ" key="salary">
 
-    <module name="ÎÒµÄн×ʸ£Àû" key="myBill">
-        <page name="ÎÒµÄн×ʸ£Àû" key="myBill">
-            <opt name="²éѯ" key="query"/>
-        </page>
-    </module>
-
-    <module name="ÅäÖÃ" key="config">
-
-        <page name="¸öË°¿Û½ÉÒåÎñÈË" key="taxAgent">
-            <opt name="²éѯ" key="query"/>
-            <opt name="¹ÜÀí" key="admin"/>
-        </page>
-
-        <page name="ÒµÎñÏß¹ÜÀí" key="auth">
-            <opt name="²éѯ" key="query"/>
-            <opt name="¹ÜÀí" key="admin"/>
-        </page>
-
-        <page name="Éç±£¸£Àû·½°¸" key="siScheme">
-            <opt name="²éѯ" key="query"/>
-            <opt name="¹ÜÀí" key="admin"/>
-        </page>
-
-        <page name="н×ÊÏîÄ¿¹ÜÀí" key="salaryItem">
-            <opt name="²éѯ" key="query"/>
-            <opt name="¹ÜÀí" key="admin"/>
-        </page>
-
-        <page name="×ֶιÜÀí" key="salaryField">
-            <opt name="²éѯ" key="query"/>
-            <opt name="¹ÜÀí" key="admin"/>
-        </page>
-
-    </module>
-
-    <module name="¼ÆËã" key="calculate">
+    <module name="Ëãн" key="calculate">
 
         <page name="Éç±£¸£Àûµµ°¸" key="siArchive">
             <opt name="²éѯ" key="query"/>
@@ -115,4 +80,29 @@
         </page>
     </module>
 
+    <module name="ÉèÖÃ" key="config">
+
+        <page name="¸öË°¿Û½ÉÒåÎñÈË" key="taxAgent">
+            <opt name="²éѯ" key="query"/>
+            <opt name="¹ÜÀí" key="admin"/>
+        </page>
+
+        <page name="Éç±£¸£Àû·½°¸" key="siScheme">
+            <opt name="²éѯ" key="query"/>
+            <opt name="¹ÜÀí" key="admin"/>
+        </page>
+
+        <page name="н×ÊÏîÄ¿¹ÜÀí" key="salaryItem">
+            <opt name="²éѯ" key="query"/>
+            <opt name="¹ÜÀí" key="admin"/>
+        </page>
+
+        <page name="×ֶιÜÀí" key="salaryField">
+            <opt name="²éѯ" key="query"/>
+            <opt name="¹ÜÀí" key="admin"/>
+        </page>
+
+    </module>
+
+
 </config>
diff --git a/src/com/engine/salary/entity/auth/po/AuthRolePO.java b/src/com/engine/salary/entity/auth/po/AuthRolePO.java
index 61284e18b..0475c9b08 100644
--- a/src/com/engine/salary/entity/auth/po/AuthRolePO.java
+++ b/src/com/engine/salary/entity/auth/po/AuthRolePO.java
@@ -16,7 +16,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@ElogTransform(name = "角色")
+@ElogTransform(name = "业务线")
 public class AuthRolePO {
 
     private Long id;