From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java |   57 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
index c07c57a..8107216 100644
--- a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
+++ b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
@@ -13,17 +13,37 @@
     @Extend
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 是销售员
+     */
+    public  static final int IS_SALES = 1;
+    /**
+     * 不是销售员
+     */
+    public  static final int NOT_SALES = 2;
+
+
 
     /**
      * 主键
      */
-    private String  userId;
+    private Long  userId;
 
 
     /**
      * 真实姓名
      */
     private String  userName;
+
+    /**
+     * 可提现金额
+     */
+    private Double  withdrawalCash;
+
+    /**
+     *推广员等级
+     */
+    private Long  salesmanGrade;
 
 
     /**
@@ -152,10 +172,6 @@
     private Integer  userType;
 
 
-    /**
-     * 用户总积分
-     */
-    private Integer totalScore;
 
 
     /**
@@ -177,7 +193,7 @@
 
 
     /**
-     * 是否是销售员（1=是，0=否）
+     * 是否是销售员（1=是，2=否）
      */
     private Integer isSales;
 
@@ -216,15 +232,13 @@
         this.companyId = companyId;
     }
 
-    public void setToken(String token) {
-        this.token=userId;
-    }
 
-    public String getUserId() {
+
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public void setUserId(Long userId) {
         this.userId=userId;
     }
 
@@ -237,6 +251,21 @@
         this.userName=userName;
     }
 
+    public Double getWithdrawalCash() {
+        return withdrawalCash;
+    }
+
+    public void setWithdrawalCash(Double withdrawalCash) {
+        this.withdrawalCash = withdrawalCash;
+    }
+
+    public Long getSalesmanGrade() {
+        return salesmanGrade;
+    }
+
+    public void setSalesmanGrade(Long salesmanGrade) {
+        this.salesmanGrade = salesmanGrade;
+    }
 
     public String getUserPassword() {
         return userPassword;
@@ -442,13 +471,7 @@
         this.endTime = endTime;
     }
 
-    public Integer getTotalScore() {
-        return totalScore;
-    }
 
-    public void setTotalScore(Integer totalScore) {
-        this.totalScore = totalScore;
-    }
 
     public Integer getCurrentScore() {
         return currentScore;

--
Gitblit v1.9.1