From e786a67b2c51ea8c12d06e660a78410e073476d5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 21 十月 2024 16:28:39 +0800
Subject: [PATCH] 优化身份证脱敏正则
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 5dc68a6..c9735d8 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -5,8 +5,6 @@
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
@@ -24,7 +22,7 @@
private static final long serialVersionUID = 1L;
/** 鐢ㄦ埛ID */
- @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+ @Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
private Long userId;
/** 閮ㄩ棬ID */
@@ -44,7 +42,7 @@
private String email;
/** 鎵嬫満鍙风爜 */
- @Excel(name = "鎵嬫満鍙风爜")
+ @Excel(name = "鎵嬫満鍙风爜", cellType = ColumnType.TEXT)
private String phonenumber;
/** 鐢ㄦ埛鎬у埆 */
@@ -199,8 +197,6 @@
this.avatar = avatar;
}
- @JsonIgnore
- @JsonProperty
public String getPassword()
{
return password;
--
Gitblit v1.9.3