From dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 21:57:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 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