diff --git a/pom.xml b/pom.xml
index f8ed7ede..76481d07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,25 +6,25 @@
com.ruoyi
ruoyi
- 3.1.0
+ 3.2.0
ruoyi
http://www.ruoyi.vip
若依管理系统
- 3.1.0
+ 3.2.0
UTF-8
UTF-8
1.8
3.1.1
1.3.2
- 1.1.22
+ 1.2.1
1.19
2.9.2
2.3.2
1.2.5
- 1.2.73
+ 1.2.74
5.2.5
5.5.0
2.5
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2359bfea..da3aa62b 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
jar
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index aef4aa00..e43091e4 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,9 +3,9 @@ ruoyi:
# 名称
name: RuoYi
# 版本
- version: 3.1.0
+ version: 3.2.0
# 版权年份
- copyrightYear: 2019
+ copyrightYear: 2020
# 实例演示开关
demoEnabled: true
# 文件路径,使用jvm系统变量,兼容windows和linux;
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index cbe0f294..46823fe7 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 190454ad..e8f79c26 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index baaefe1e..43d1245e 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index bf6b9db9..ae6abe8a 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 123b8b30..95717f7b 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
ruoyi
com.ruoyi
- 3.1.0
+ 3.2.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index a71e194f..c9cf69e1 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.1.0",
+ "version": "3.2.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e7f4180e..e8243f6a 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -59,8 +59,8 @@ export function addDateRange(params, dateRange) {
search.beginTime = "";
search.endTime = "";
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
return search;
}
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 5ed6ed94..2b091e7f 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -111,7 +111,7 @@
type="text"
icon="el-icon-caret-right"
@click="handleRun(scope.row)"
- v-hasPermi="['monitor:job:edit']"
+ v-hasPermi="['monitor:job:changeStatus']"
>执行一次