From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
index e784058..3774bde 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
@@ -278,7 +278,7 @@
 	        activitySignWriteoffDao.updateById(activitySignWriteoff);
 	        //更新领取记录
 	        ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
-	        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
+	        activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
 	        activitySignReceiveRecord.setConsignee(logisticsSubmitDto.getShr());
 	        activitySignReceiveRecord.setConsigneeAddress(logisticsSubmitDto.getShdz());
 	        activitySignReceiveRecord.setConsigneePhone(logisticsSubmitDto.getLxdh());

--
Gitblit v1.9.1