From f6d898060ce3ab0bbca1924fad724858d4adc296 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 22 Jan 2021 13:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java
index 1319298..c71e8e9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java
@@ -24,11 +24,6 @@
private Long id;
/**
- * 会员ID
- */
- private Long vipId;
-
- /**
* 标签内容
*/
private String label;
@@ -36,6 +31,36 @@
private Long shopId;
private Long companyId;
+
+ private Long userId;
+
+ private Integer isAll;
+
+ private String color;
+
+ 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 +100,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() {
--
Gitblit v1.9.1