Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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());