From e80349c34385a8dc1a666afe56f332c5b841d28d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 十二月 2020 11:46:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 29 -----------------------------
1 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index bb61634..f7d5bf4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -5,7 +5,6 @@
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Entity鍩虹被
@@ -35,14 +34,6 @@
/** 澶囨敞 */
private String remark;
-
- /** 寮�濮嬫椂闂� */
- @JsonIgnore
- private String beginTime;
-
- /** 缁撴潫鏃堕棿 */
- @JsonIgnore
- private String endTime;
/** 璇锋眰鍙傛暟 */
private Map<String, Object> params;
@@ -105,26 +96,6 @@
public void setRemark(String remark)
{
this.remark = remark;
- }
-
- public String getBeginTime()
- {
- return beginTime;
- }
-
- public void setBeginTime(String beginTime)
- {
- this.beginTime = beginTime;
- }
-
- public String getEndTime()
- {
- return endTime;
- }
-
- public void setEndTime(String endTime)
- {
- this.endTime = endTime;
}
public Map<String, Object> getParams()
--
Gitblit v1.9.3