Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 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;