From 1624debefe4c0f83722da3edf2419320c0ce75b1 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 18 七月 2020 12:23:20 +0800
Subject: [PATCH] !41 禁止加密密文返回前端 Merge pull request !41 from 平凡/hmxmylove-master-patch-79033
---
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 7548bc9..08f4f90 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -4,7 +4,6 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -37,12 +36,16 @@
/** 备注 */
private String remark;
- /** 数据权限 */
- private String dataScope;
+ /** 开始时间 */
+ @JsonIgnore
+ private String beginTime;
+
+ /** 结束时间 */
+ @JsonIgnore
+ private String endTime;
/** 请求参数 */
- @JsonIgnore
- private String params;
+ private Map<String, Object> params;
public String getSearchValue()
{
@@ -104,27 +107,36 @@
this.remark = remark;
}
- public String getDataScope()
+ public String getBeginTime()
{
- return dataScope;
+ return beginTime;
}
- public void setDataScope(String dataScope)
+ public void setBeginTime(String beginTime)
{
- this.dataScope = dataScope;
+ this.beginTime = beginTime;
}
- @SuppressWarnings("unchecked")
+ public String getEndTime()
+ {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime)
+ {
+ this.endTime = endTime;
+ }
+
public Map<String, Object> getParams()
{
if (params == null)
{
- return new HashMap<>();
+ params = new HashMap<>();
}
- return JSON.parseObject(params, Map.class);
+ return params;
}
- public void setParams(String params)
+ public void setParams(Map<String, Object> params)
{
this.params = params;
}
--
Gitblit v1.9.2