From f470fcfdfd5c6b83a2e20eae3a9fa3043c9e44ed Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 6 Jun 2022 11:36:20 +0800 Subject: [PATCH] update --- .../static/adminlte/css/skins/skin-dark.css | 3 ++- .../com/jeesite/modules/sys/entity/Log.java | 19 ++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css index 345059ee..5ee47eec 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css @@ -210,7 +210,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .btn-default:active:focus, .btn-default:active:hover, .open>.dropdown-toggle.btn-default.focus, .open>.dropdown-toggle.btn-default:focus, .open>.dropdown-toggle.btn-default:hover { background-color:#3e3e3e;border-color:#3e3e3e;color:#eee;} -.input-group-btn .btn, .treeSearchInput button {background-color:#1a1a1a;border-color:#3c3c3c;color:#ddd;} +.input-group-btn .btn, .treeSearchInput button, .treeSearchInput button:hover, .treeSearchInput button:focus { + background-color:#1a1a1a;border-color:#3c3c3c;color:#ddd;} .treeExpandCollapse, .treeExpandCollapse a {background-color:#1a1a1a;color:#8d8d8d;} .btn-primary, .btn-primary:hover, .btn-primary:active, diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 8d314984..46825cdf 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -4,13 +4,6 @@ */ package com.jeesite.modules.sys.entity; -import java.util.Map; - -import javax.validation.constraints.NotBlank; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import javax.validation.constraints.Size; - import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.entity.BaseEntity; @@ -21,6 +14,10 @@ import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Map; + /** * 操作日志Entity * @author ThinkGem @@ -284,9 +281,9 @@ public class Log extends DataEntity { return values != null && values.length > 0 ? values[0] : null; } - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } +// @Override +// public String toString() { +// return ReflectionToStringBuilder.toString(this); +// } } \ No newline at end of file