From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java b/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
index f34e792..c8fe8d7 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java
@@ -2,7 +2,7 @@
import com.matrix.core.anotations.Extend;
import com.matrix.core.pojo.EntityDTO;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -19,8 +19,11 @@
private static final long serialVersionUID = 1L;
/** 有效*/
+ @Extend
public static final String VALID_Y="Y";
+
/** 无效*/
+ @Extend
public static final String VALID_N="N";
private Long suId;
@@ -170,7 +173,7 @@
/**
* 生日
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date suBirthday;
/**
@@ -202,7 +205,7 @@
/**
* 入职时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date entryDate;
/**
* 紧急联系电话
--
Gitblit v1.9.1