From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-web/src/main/resources/templates/system/user/edit.html |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html b/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
index 076bf9f..4a0601a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/user/edit.html
@@ -77,13 +77,14 @@
                 </div>
             </div>
             <div class="row">
+
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">宀椾綅锛�</label>
+                        <label class="col-sm-4 control-label">瑙掕壊锛�</label>
                         <div class="col-sm-8">
-                            <select id="post" class="form-control select2-multiple" multiple>
-								<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
-							</select>
+                            <label th:each="role:${roles}" class="check-box">
+                                <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
+                            </label>
                         </div>
                     </div>
                 </div>
@@ -98,14 +99,14 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-            	<div class="col-sm-6">
+            <div class="row" style="display: none">
+                <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">瑙掕壊锛�</label>
+                        <label class="col-sm-4 control-label">宀椾綅锛�</label>
                         <div class="col-sm-8">
-                            <label th:each="role:${roles}" class="check-box">
-								<input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:checked="${role.flag}" th:disabled="${role.status == '1'}">
-							</label>
+                            <select id="post" class="form-control select2-multiple" multiple>
+                                <option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:selected="${post.flag}" th:disabled="${post.status == '1'}"></option>
+                            </select>
                         </div>
                     </div>
                 </div>

--
Gitblit v1.9.3