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

 Conflicts:

	README.md

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

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

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

	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-ui/src/api/login.js

	ruoyi-ui/src/views/index.vue

ruoyi-ui/src/api/login.js

@@ -10,6 +10,9 @@ export function login(username, password, code, uuid) {
   }
   return request({
     url: '/login',
+    headers: {
+      isToken: false
+    },
     method: 'post',
     data: data
   })
@@ -47,7 +50,10 @@ export function logout() {
 export function getCodeImg() {
   return request({
     url: '/captchaImage',
+    headers: {
+      isToken: false
+    },
     method: 'get',
     timeout: 20000
   })
-}
+}

ruoyi-ui/src/utils/ruoyi.js

@@ -85,8 +85,8 @@ export function selectDictLabels(datas, value, 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);
+			if (datas[key].value == ('' + temp[val])) {
+				actions.push(datas[key].label + currentSeparator);
 			}
 		})
 	})