From c18037dc5de7f67175c2cf80cd04761d198739b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48: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/ActivitySignWriteoff.java |    4 +---
 1 files changed, 1 insertions(+), 3 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
index 7ab47e4..febff5f 100644
--- 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
@@ -85,7 +85,7 @@
 	 */
 
 
-	private Long  logisticsId;
+	private Integer  logisticsId;
 	
 	/**
 	 * 中奖记录ID
@@ -114,8 +114,6 @@
 
 
 	private Long  writeoffUserid;
-
-
 
   
 }
\ No newline at end of file

--
Gitblit v1.9.1