Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 26574047ac19087a7f8dc310ddc44dc24fc9b851

 zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java

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


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