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

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


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


    /**
@@ -475,13 +471,7 @@
        this.endTime = endTime;
    }

    public Integer getTotalScore() {
        return totalScore;
    }

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

    public Integer getCurrentScore() {
        return currentScore;