From 2124957e815ab67a6ad34f03546bac3e5e0c7685 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Apr 2021 18:23:10 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
index 2a71e6c..30b0210 100644
--- a/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
+++ b/zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
@@ -44,7 +44,7 @@
 	private ActivitySignReceiveRecordDao activitySignReceiveRecordDao;
 	
 	@Autowired
-	private ActivitySignWriteoffDao activitySignWriteoffDao;
+	private ActivitySignWriteoffDao activitgwLinkUsySignWriteoffDao;
 	
 	@Autowired
 	private ActivitySignRecordDao activitySignRecordDao;

--
Gitblit v1.9.1