From 2a403069421812d49ce1b78dc5c4adc595ee0e7d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 18:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
index fed2f9c..6d47589 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
@@ -1,7 +1,7 @@
 package com.oying.modules.pc.product.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.product.domain.Product;
 import com.oying.modules.pc.product.service.ProductService;
 import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;

--
Gitblit v1.9.3