From be0b36f6b928c349a197092cc4695d6825777736 Mon Sep 17 00:00:00 2001
From: yangfanao <2364917935@qq.com>
Date: Tue, 25 Apr 2023 17:35:36 +0800
Subject: [PATCH] update ruoyi-ui/src/layout/components/Sidebar/Logo.vue. 修改了第38行的/* title: '若依后台管理系统', */ 为/* title: process.env.VUE_APP_TITLE, */,使得侧边栏的平台标题内容可以和vue.config.js里面的process.env.VUE_APP_TITLE保持同步。
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 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 a8c51a7..67269ff 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
@@ -6,6 +6,7 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* Entity基类
@@ -17,6 +18,7 @@
private static final long serialVersionUID = 1L;
/** 搜索值 */
+ @JsonIgnore
private String searchValue;
/** 创建者 */
@@ -36,15 +38,8 @@
/** 备注 */
private String remark;
- /** 开始时间 */
- @JsonIgnore
- private String beginTime;
-
- /** 结束时间 */
- @JsonIgnore
- private String endTime;
-
/** 请求参数 */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public String getSearchValue()
@@ -105,26 +100,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.2