Merge branch 'master' of https://gitee.com/y_project/RuoYi

src/main/resources/templates/system/dict/data/add.html

@@ -32,7 +32,15 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">回显样式：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" id="listClass" name="listClass">
+					<select name="listClass" class="form-control m-b">
+					    <option value="">---请选择---</option>
+	                    <option value="default">默认</option>
+	                    <option value="primary">主要</option>
+	                    <option value="success">成功</option>
+	                    <option value="info">   信息</option>
+	                    <option value="warning">警告</option>
+	                    <option value="danger"> 危险</option>
+	                </select>
 				</div>
 			</div>
 			<div class="form-group">

src/main/resources/templates/system/dict/data/edit.html

@@ -33,7 +33,15 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">回显样式：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" id="listClass" name="listClass" th:field="*{listClass}">
+					<select name="listClass" class="form-control m-b">
+					    <option value=""        th:field="*{listClass}">---请选择---</option>
+	                    <option value="default" th:field="*{listClass}">默认</option>
+	                    <option value="primary" th:field="*{listClass}">主要</option>
+	                    <option value="success" th:field="*{listClass}">成功</option>
+	                    <option value="info"    th:field="*{listClass}">信息</option>
+	                    <option value="warning" th:field="*{listClass}">警告</option>
+	                    <option value="danger"  th:field="*{listClass}">危险</option>
+	                </select>
 				</div>
 			</div>
 			<div class="form-group">