From c47ae02900bb1b872c4e9b1820b2ff4a64a119b8 Mon Sep 17 00:00:00 2001 From: zhangpeng0088 Date: Mon, 21 Feb 2022 06:15:46 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20ruoyi-admin/src/main/resources/tem?= =?UTF-8?q?plates/system/user/user.html.=20=E5=A6=82=E8=BF=87ID=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E4=B8=80=E5=AE=9A=E7=9A=84=E4=BD=8D=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=8F=AA=E8=83=BD=E9=80=9A=E8=BF=87String?= =?UTF-8?q?=E5=A4=84=E7=90=86ID=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E7=B2=BE=E5=BA=A6=E3=80=82ID=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E4=B8=BASring=E5=90=8E=EF=BC=8C=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E2=80=9C=E6=9B=B4=E5=A4=9A=E6=93=8D=E4=BD=9C=E2=80=9D=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=8A=9F=E8=83=BD=E7=94=B1=E4=BA=8E=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AF=B9=E5=8F=82=E6=95=B0=E5=8A=A0=E5=BC=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8D=E6=AD=A3=E5=B8=B8=E3=80=82?= =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E8=80=81=E9=A1=B9=E7=9B=AE=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=96=B0=E6=A1=86=E6=9E=B6=EF=BC=8C=E6=88=96=E5=A4=A7=E5=9E=8B?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=87=8C=E9=9D=A2=E4=BD=BF=E7=94=A8=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=9C=89=E6=AD=A4=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/system/user/user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html index 94930329a..b4cb35ff6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/user.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html @@ -176,8 +176,8 @@ actions.push('编辑 '); actions.push('删除 '); var more = []; - more.push("重置密码 "); - more.push("分配角色"); + more.push("重置密码 "); + more.push("分配角色"); actions.push('更多操作'); return actions.join(''); } else { From d412a2ba50b1e8d4ec669808556769cf20dd9891 Mon Sep 17 00:00:00 2001 From: zhangpeng0088 Date: Mon, 21 Feb 2022 06:18:59 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3id=E4=B8=BAString?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E4=B8=80=E5=AE=9A=E4=BD=8D=E6=95=B0=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E2=80=9C=E6=9B=B4=E5=A4=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E2=80=9D=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=A5=BD=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=A6=82=E8=BF=87ID=E8=B6=85=E8=BF=87?= =?UTF-8?q?=E4=B8=80=E5=AE=9A=E7=9A=84=E4=BD=8D=E6=95=B0=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E5=8F=AA=E8=83=BD=E9=80=9A=E8=BF=87String=E5=A4=84?= =?UTF-8?q?=E7=90=86ID=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E3=80=82ID=E8=BD=AC=E6=8D=A2=E4=B8=BASring?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E7=9A=84=E2=80=9C=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E6=93=8D=E4=BD=9C=E2=80=9D=E9=87=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=B1=E4=BA=8E=E6=B2=A1=E6=9C=89=E5=AF=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8A=A0=E5=BC=95=E5=8F=B7=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E4=B8=8D=E6=AD=A3=E5=B8=B8=E3=80=82=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E8=80=81=E9=A1=B9=E7=9B=AE=E8=BD=AC=E6=8D=A2=E6=96=B0=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=88=96=E5=A4=A7=E5=9E=8B=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E4=BD=BF=E7=94=A8=E5=8F=AF=E8=83=BD=E6=9C=89?= =?UTF-8?q?=E6=AD=A4=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/system/role/role.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html index c16b7fd1c..8b60e104a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/role.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html @@ -117,9 +117,9 @@ actions.push('编辑 '); actions.push('删除 '); var more = []; - more.push("数据权限 "); - more.push("分配用户"); - actions.push('更多操作'); + more.push("数据权限 "); + more.push("分配用户"); + actions.push('更多操作'); return actions.join(''); } else { return "";