From 2bb9c3accaffbf8c500d62b11d74df1cf0ab144b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 25 Aug 2025 20:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/8-6' into 8-6

---
 src/main/java/com/nq/controller/backend/AdminStockTimeSettingController.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/controller/backend/AdminStockTimeSettingController.java b/src/main/java/com/nq/controller/backend/AdminStockTimeSettingController.java
index 3d76fa7..4f67b3b 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockTimeSettingController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockTimeSettingController.java
@@ -2,9 +2,7 @@
 
 
 import com.nq.common.ServerResponse;
-import com.nq.pojo.StockSetting;
 import com.nq.pojo.StockTimeSetting;
-import com.nq.service.IStockSettingServices;
 import com.nq.service.IStockTimeSettingServices;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

--
Gitblit v1.9.3