From b0da63410a7aaf64b11183c95b3da38013a6457b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 28 Oct 2025 15:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
index 0dabac0..7366e6a 100644
--- a/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
+++ b/ard-common/src/main/java/com/ard/common/core/domain/entity/SysUser.java
@@ -3,6 +3,8 @@
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ard.common.annotation.Excel;
@@ -15,8 +17,9 @@
 /**
  * 用户对象 sys_user
  * 
- * @author ruoyi
+ * @author ard
  */
+
 public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

--
Gitblit v1.9.3