From 83d9e74500d4c368bef074c26c34254abf9b0955 Mon Sep 17 00:00:00 2001
From: zhujj <Administrator@G6DKBNY0IH0AICJ>
Date: Fri, 11 Jan 2019 14:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/core/config/SwaggerConfig.java   |  3 ++-
 .../main/resources/templates/vip/user/add.html | 18 +-----------------
 .../resources/templates/vip/user/edit.html     | 17 -----------------
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index eaa2ee407..34b070d19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.core.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import com.ruoyi.common.config.Global;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -32,7 +33,7 @@ public class SwaggerConfig
                 .apiInfo(apiInfo())
                 .select()
                 // 指定当前包路径
-                .apis(RequestHandlerSelectors.basePackage("com.ruoyi"))
+                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build();
diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/add.html b/ruoyi-vip/src/main/resources/templates/vip/user/add.html
index 844170ff4..e1db1bb1a 100644
--- a/ruoyi-vip/src/main/resources/templates/vip/user/add.html
+++ b/ruoyi-vip/src/main/resources/templates/vip/user/add.html
@@ -62,23 +62,7 @@
                      </div>
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">岗位：</label>
-				<div class="col-sm-8">
-					<select id="post" name="post" class="form-control select2-hidden-accessible" multiple="">
-						<option th:each="post:${posts}" th:value="${post.postId}" th:text="${post.postName}" th:disabled="${post.status == '1'}"></option>
-					</select>
-					
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 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:disabled="${role.status == '1'}">
-					</label>
-				</div>
-			</div>
+
 		</form>
 	</div>
 	<div th:include="include::footer"></div>
diff --git a/ruoyi-vip/src/main/resources/templates/vip/user/edit.html b/ruoyi-vip/src/main/resources/templates/vip/user/edit.html
index 5bd8a49c4..fa817106a 100644
--- a/ruoyi-vip/src/main/resources/templates/vip/user/edit.html
+++ b/ruoyi-vip/src/main/resources/templates/vip/user/edit.html
@@ -57,23 +57,6 @@
                      </div>
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">岗位：</label>
-				<div class="col-sm-8">
-					<select id="post" name="post" class="form-control select2-hidden-accessible" 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 class="form-group">
-				<label class="col-sm-3 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>
-				</div>
-			</div>
 		</form>
 	</div>
 	<div th:include="include::footer"></div>