From ec74f248ddac773a6024a243a37346bd2e9bb028 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 15 Oct 2020 23:46:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
src/main/java/com/xcong/excoin/system/entity/User.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/system/entity/User.java b/src/main/java/com/xcong/excoin/system/entity/User.java
index c68b9ec..5584046 100644
--- a/src/main/java/com/xcong/excoin/system/entity/User.java
+++ b/src/main/java/com/xcong/excoin/system/entity/User.java
@@ -17,6 +17,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -44,7 +45,7 @@
/**
* 默认密码
*/
- public static final String DEFAULT_PASSWORD = "1234qwer";
+ public static final String DEFAULT_PASSWORD = "hibit123";
/**
* 性别男
*/
@@ -220,6 +221,9 @@
@TableField(exist = false)
private String deptIds;
+ @TableField(exist = false)
+ private BigDecimal returnRatio;
+
public Long getId() {
return userId;
}
--
Gitblit v1.9.1