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

 Conflicts:

	pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-ui/babel.config.js

	ruoyi-ui/package.json

	ruoyi-ui/src/api/tool/gen.js

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/components/HeaderSearch/index.vue

	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

	ruoyi-ui/src/main.js

	ruoyi-ui/src/utils/ruoyi.js

	ruoyi-ui/src/views/login.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/vue.config.js

	sql/ry_20200724.sql

ruoyi-ui/src/utils/ruoyi.js

@@ -77,6 +77,21 @@ export function selectDictLabel(datas, value) {
 	return actions.join('');
 }
 
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+	var actions = [];
+	var currentSeparator = undefined === separator ? "," : separator;
+	var temp = value.split(currentSeparator);
+	Object.keys(value.split(currentSeparator)).some((val) => {
+        Object.keys(datas).some((key) => {
+            if (datas[key].dictValue == ('' + temp[val])) {
+				actions.push(datas[key].dictLabel + currentSeparator);
+			}
+		})
+	})
+	return actions.join('').substring(0, actions.join('').length - 1);
+}
+
 // 通用下载方法
 export function download(fileName) {
 	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
@@ -98,10 +113,10 @@ export function sprintf(str) {
 
 // 转换字符串，undefined,null等转化为""
 export function praseStrEmpty(str) {
-    if (!str || str == "undefined" || str == "null") {
-        return "";
-    }
-    return str;
+	if (!str || str == "undefined" || str == "null") {
+		return "";
+	}
+	return str;
 }
 
 /**
@@ -120,15 +135,15 @@ export function handleTree(data, id, parentId, children, rootId) {
 	//对源数据深度克隆
 	const cloneData = JSON.parse(JSON.stringify(data))
 	//循环所有项
-	const treeData =  cloneData.filter(father => {
-	  let branchArr = cloneData.filter(child => {
-		//返回每一项的子级数组
-		return father[id] === child[parentId]
-	  });
-	  branchArr.length > 0 ? father.children = branchArr : '';
-	  //返回第一层
-	  return father[parentId] === rootId;
+	const treeData = cloneData.filter(father => {
+		let branchArr = cloneData.filter(child => {
+			//返回每一项的子级数组
+			return father[id] === child[parentId]
+		});
+		branchArr.length > 0 ? father.children = branchArr : '';
+		//返回第一层
+		return father[parentId] === rootId;
 	});
 	return treeData != '' ? treeData : data;
-  }
-  
+}
+