From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java
index d1be69c..5ef3256 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java
@@ -53,6 +53,12 @@
@ApiModelProperty(value = "赠送金额")
private BigDecimal giftPrice;
+ @ApiModelProperty(value = "固定/任选套餐 Y-任选 N-固定")
+ private String isCourse;
+
+ @ApiModelProperty(value = "最大使用次数")
+ private Integer maxUseCnt;
+
@ApiModelProperty(value = "项目关联产品--配料表、卡项可消费产品")
List<ShoppingGoodsDetailVo> assembleProj;
@@ -200,4 +206,20 @@
public void setCardCategory(List<ShoppingGoodsCategory> cardCategory) {
this.cardCategory = cardCategory;
}
+
+ public String getIsCourse() {
+ return isCourse;
+ }
+
+ public void setIsCourse(String isCourse) {
+ this.isCourse = isCourse;
+ }
+
+ public Integer getMaxUseCnt() {
+ return maxUseCnt;
+ }
+
+ public void setMaxUseCnt(Integer maxUseCnt) {
+ this.maxUseCnt = maxUseCnt;
+ }
}
--
Gitblit v1.9.1