From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java b/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
index e79f0b0..55b9b10 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java
@@ -56,6 +56,10 @@
public GoodsorderService goodsorderService;
@Autowired
+ public ShopService shopService;
+
+
+ @Autowired
public GoodsorderDetailService goodsorderDetailService;
@Autowired
@@ -74,8 +78,6 @@
@Autowired
public ArticleService articleService;
- @Autowired
- public ShopService shopService;
@Autowired
public ShopNewsService shopNewsService;
--
Gitblit v1.9.3