Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-07-07 1a987e34e395c32ec56937b2424c9f44308199a8

 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;
    }