From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java
index ccfea36..3d30f87 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java
@@ -99,6 +99,9 @@
 
 	@ApiModelProperty(value ="兑奖方式（1：线下兑换2：物流配送3：客服兑换）")
 	private int  awardWay;
+	public static final int AWARDWAY_ONE = 1;
+	public static final int AWARDWAY_TWO = 2;
+	public static final int AWARDWAY_THREE = 3;
 	
 	/**
 	 * 奖品是否有效（1：有效 2：无效）
@@ -143,6 +146,8 @@
 
 	@ApiModelProperty(value ="客服微信")
 	private String  wechatImg;
+	@ApiModelProperty(value ="客服电话")
+	private String  customerPhone;
 	
 	/**
 	 * 积分数量

--
Gitblit v1.9.1