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

@@ -27,7 +27,7 @@
    /**
     * 主键
     */
    private String  userId;
    private Long  userId;


    /**
@@ -43,7 +43,7 @@
    /**
     *推广员等级
     */
    private Double  salesmanGrade;
    private Long  salesmanGrade;


    /**
@@ -172,10 +172,6 @@
    private Integer  userType;


    /**
     * 用户总积分
     */
    private Integer totalScore;


    /**
@@ -236,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;
    }

@@ -265,11 +259,11 @@
        this.withdrawalCash = withdrawalCash;
    }

    public Double getSalesmanGrade() {
    public Long getSalesmanGrade() {
        return salesmanGrade;
    }

    public void setSalesmanGrade(Double salesmanGrade) {
    public void setSalesmanGrade(Long salesmanGrade) {
        this.salesmanGrade = salesmanGrade;
    }

@@ -477,13 +471,7 @@
        this.endTime = endTime;
    }

    public Integer getTotalScore() {
        return totalScore;
    }

    public void setTotalScore(Integer totalScore) {
        this.totalScore = totalScore;
    }

    public Integer getCurrentScore() {
        return currentScore;