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

 Conflicts:

	ruoyi-ui/src/utils/ruoyi.js

ruoyi-ui/src/utils/ruoyi.js

@@ -54,12 +54,15 @@ export function resetForm(refName) {
 }
 
 // 添加日期范围
-export function addDateRange (params = {}, dateRange) {
-	if (dateRange != null && dateRange !== '') {
-	  params.beginTime = this.dateRange[0]
-	  params.endTime = this.dateRange[1]
+export function addDateRange(params, dateRange) {
+	var search = params;
+	search.beginTime = "";
+	search.endTime = "";
+	if (null != dateRange && '' != dateRange) {
+		search.beginTime = this.dateRange[0];
+		search.endTime = this.dateRange[1];
 	}
-	return params
+	return search;
 }
 
 // 回显数据字典