From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
index 9e04ce0..65462c7 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java
@@ -1,7 +1,7 @@
 package com.oying.modules.pc.store.rest;
 
 import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
 import com.oying.modules.pc.store.domain.StoreCategory;
 import com.oying.modules.pc.store.service.StoreCategoryService;
 import com.oying.modules.pc.store.domain.dto.StoreCategoryQueryCriteria;
@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.utils.PageResult;
 
 /**
 * @author lzp

--
Gitblit v1.9.3