Merge branch 'master' of D:\project\haoban-manage3.0-new with conflicts.

bb4512d8 · fudahua · 9c004b38 · bb4512d8 · bb4512d8
Commit bb4512d8 authored Dec 25, 2020 by fudahua
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 3 deletions

DealSyncTest.java haoban-manage3-service/src/test/java/DealSyncTest.java +0 -0

AdminController.java ...com/gic/haoban/manage/web/controller/AdminController.java +1 -3

No files found.
--- a/haoban-manage3-service/src/test/java/DealSyncTest.java
+++ b/haoban-manage3-service/src/test/java/DealSyncTest.java
--- a/haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AdminController.java
+++ b/haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AdminController.java
@@ -38,9 +38,7 @@ public class AdminController extends WebBaseController{
 	private StaffApiService staffApiService;
 	@Autowired
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
-	@Autowired
-	private WxApplicationApiService wxApplicationApiService;
-	
+
 	@Autowired
 	private WxEnterpriseApiService wxEnterpriseApiService;