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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java

@@ -38,6 +38,16 @@

    private String color;

    private String shopName;

    public String getShopName() {
        return shopName;
    }

    public void setShopName(String shopName) {
        this.shopName = shopName;
    }

    public Long getUserId() {
        return userId;
    }