From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
new file mode 100644
index 0000000..febff5f
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java
@@ -0,0 +1,119 @@
+package com.matrix.system.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.matrix.core.anotations.Extend;
+import com.matrix.system.score.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @description 核销记录
+ * @author yourName
+ * @date 2021-04-08 14:25
+ */
+@Data
+@TableName("activity_sign_writeoff")
+public class ActivitySignWriteoff  extends BaseEntity{
+	@Extend
+	private static final long serialVersionUID = 1L; 
+
+	
+
+
+	
+	/**
+	 * 核销时间
+	 */
+
+
+	private Date  writeoffTime;
+	
+	/**
+	 * 核销员
+	 */
+
+
+	private String  writeoffUser;
+	
+	/**
+	 * 兑奖码
+	 */
+
+
+	private String  writeoffCode;
+	
+	/**
+	 * 活动ID
+	 */
+
+
+	private Long  actId;
+	
+	/**
+	 * 奖品ID
+	 */
+
+
+	private Long  awardId;
+	
+	/**
+	 * 中奖时间
+	 */
+
+
+	private Date  winTime;
+	
+	/**
+	 * 状态(1:待兑换 2:待发货  3:已兑换  )
+	 */
+	private Integer  state;
+	public static final int STATE_ONE = 1;
+	public static final int STATE_TWO = 2;
+	public static final int STATE_THREE = 3;
+	
+	/**
+	 * 中奖者ID
+	 */
+
+
+	private Long  userId;
+	
+	/**
+	 * 物流ID
+	 */
+
+
+	private Integer  logisticsId;
+	
+	/**
+	 * 中奖记录ID
+	 */
+
+
+	private Long  receiveId;
+	
+	/**
+	 * 公司ID
+	 */
+
+
+	private Long  companyId;
+	
+	/**
+	 * 店铺ID
+	 */
+
+
+	private Long  shopId;
+	
+	/**
+	 * 核销员ID
+	 */
+
+
+	private Long  writeoffUserid;
+
+  
+}
\ No newline at end of file

--
Gitblit v1.9.1