Merge remote-tracking branch 'origin/master'

@@ -109,10 +109,11 @@
 				<el-row :gutter="20">
 					<el-col :span="8">
 						<el-form-item label="权限排序" prop="permissionOrder">
-							<el-input-number v-model="addForm.permissionOrder"
-											 auto-complete="off"
-											 controls-position="right"
-											 placeholder="请输入权限排序：例如:123"></el-input-number>
+							<el-input
+									placeholder="请输入权限排序,如001"
+									v-model="addForm.permissionOrder"
+									clearable>
+							</el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">