From 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 21 Oct 2021 08:40:55 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
index d0fd4d8..c9b6e8b 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
@@ -23,6 +23,9 @@
     @ApiModelProperty(value = "商品名称")
     private String name;
 
+    @ApiModelProperty(value = "套餐来源,转让,购买")
+    private String source;
+
     @ApiModelProperty(value = "时长")
     private Integer timeLength;
 
@@ -127,15 +130,23 @@
         }
     }
 
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
     public Double getBalance() {
         return balance;
     }
 
     public void setBalance(Double balance) {
         this.balance = balance;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
     }
 }

--
Gitblit v1.9.1