beauty-erp.git - Gitblit

			@@ -24,11 +24,6 @@
			private Long id;

			/**
			* 会员ID
			*/
			private Long vipId;

			/**
			* 标签内容
			*/
			private String label;
			@@ -36,6 +31,46 @@
			private Long shopId;

			private Long companyId;

			private Long userId;

			private Integer isAll;

			private String color;

			private String shopName;

			public String getShopName() {
			return shopName;
			}

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

			public Long getUserId() {
			return userId;
			}

			public void setUserId(Long userId) {
			this.userId = userId;
			}

			public Integer getIsAll() {
			return isAll;
			}

			public void setIsAll(Integer isAll) {
			this.isAll = isAll;
			}

			public String getColor() {
			return color;
			}

			public void setColor(String color) {
			this.color = color;
			}

			public Long getShopId() {
			return shopId;
			@@ -75,14 +110,6 @@

			public void setId(Long id) {
			this.id = id;
			}

			public Long getVipId() {
			return vipId;
			}

			public void setVipId(Long vipId) {
			this.vipId = vipId;
			}

			public String getLabel() {