添加exportOptions属性，防止前端导出无法忽略操作列

ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js

@@ -37,6 +37,11 @@ $(document).ready(function(){
 		var birth = /^(19|20)\d{2}-(1[0-2]|0?[1-9])-(0?[1-9]|[1-2][0-9]|3[0-1])$/;
 		return this.optional(element) || (birth).test(value);
 	},"出生日期格式示例2000-01-01");
+	//校验IP地址
+	jQuery.validator.addMethod("isIp",function(value,element){
+		var ip = /^(?:(?:2[0-4][0-9]\.)|(?:25[0-5]\.)|(?:1[0-9][0-9]\.)|(?:[1-9][0-9]\.)|(?:[0-9]\.)){3}(?:(?:2[0-4][0-9])|(?:25[0-5])|(?:1[0-9][0-9])|(?:[1-9][0-9])|(?:[0-9]))$/;
+		return this.optional(element) || (ip).test(value);
+	},"IP地址格式示例127.0.0.1");
 	//校验新旧密码是否相同
 	jQuery.validator.addMethod("isdiff",function(){
 		var p1=$("#pwdOld").val();

ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css

@@ -46,9 +46,12 @@
 .mb20 {
 	margin-bottom: 20px;
 }
-.ml20 {
+.m20 {
 	margin-left: 20px;
 }
+.m50 {
+	margin-left: 50px;
+}
 .img-xs {
   width: 32px;
   height: 32px;
@@ -618,6 +621,13 @@ label {
 	margin: 5px 15px 5px 0px;
 }
 
+.select-list li p{
+	float: left;
+	width: 80px;
+	margin: 5px 15px 5px 0px;
+	text-align:right;
+}
+
 .select-list li input {
 	border: 1px solid #ddd;
 	border-radius: 4px;
@@ -748,6 +758,13 @@ label {
 	cursor: pointer;
 }
 
+.select-title{
+	color:#3d5266;
+	font-size:15px;
+	padding:10px 0px;
+	font-weight: normal;
+}
+
 /** 表格查询数据 **/
 .table-striped {
 	min-height: 75%;
@@ -894,4 +911,4 @@ label {
     height: 32px;
     display: block;
     float:left;
-}
+}

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -82,6 +82,7 @@
                     columns: options.columns,                           // 显示列信息（*）
                     responseHandler: $.table.responseHandler,           // 在加载服务器发送来的数据之前处理函数
                     onLoadSuccess: $.table.onLoadSuccess,               // 当所有数据被加载时触发处理函数
+                    exportOptions: options.exportOptions,               // 前端导出忽略列索引
                 });
             },
             // 查询条件

ruoyi-admin/src/main/resources/templates/system/user/add.html

@@ -232,7 +232,7 @@
 			var options = {
 				title: '选择部门',
 				width: "380",
-				url: ctx + "system/dept/selectDeptTree/" + deptId,
+				url: url,
 				callBack: doSubmit
 			};
 			$.modal.openOptions(options);

ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java

@@ -48,7 +48,7 @@ public interface ShiroConstants
     public static final String CURRENT_ENABLED = "captchaEnabled";
 
     /**
-     * 验证码开关
+     * 验证码类型
      */
     public static final String CURRENT_TYPE = "captchaType";