From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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..a68a8d5 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;
/**
* 紧急联系电话
@@ -241,6 +244,7 @@
private String shopName;
+ private String allCustomer;
private String roleName;
@@ -269,6 +273,7 @@
private String departName;
+
/**
* 入职时间区域查询
**/
@@ -283,6 +288,24 @@
@Extend
private SysCompany company;
+ private String openIds;
+
+ public String getOpenIds() {
+ return openIds;
+ }
+
+ public void setOpenIds(String openIds) {
+ this.openIds = openIds;
+ }
+
+ public String getAllCustomer() {
+ return allCustomer;
+ }
+
+ public void setAllCustomer(String allCustomer) {
+ this.allCustomer = allCustomer;
+ }
+
public Long getSuId() {
return suId;
}
--
Gitblit v1.9.1