From 9fb0b7d623078e90747ac4a64283f29d4b4d51d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 15:11:08 +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/ActivitySignReceiveRecord.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
index ab1b4be..f59cb27 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java
@@ -56,6 +56,9 @@
 
 
 	private Integer  state;
+
+	public static final int STATE_ING = 1;
+	public static final int STATE_DONE = 2;
 	
 	/**
 	 * 核销码
@@ -78,6 +81,19 @@
 
 	private Long  companyId;
 
+	/**
+	 * 收货人
+	 */
+	private String  consignee;
+	/**
+	 * 联系电话
+	 */
+	private String  consigneePhone;
+	/**
+	 * 收货地址
+	 */
+	private String  consigneeAddress;
+
 
 
   

--
Gitblit v1.9.1