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-common/src/main/java/com/oying/utils/R.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java b/oying-common/src/main/java/com/oying/utils/R.java
similarity index 97%
rename from oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
rename to oying-common/src/main/java/com/oying/utils/R.java
index e85df96..79c3cfb 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
+++ b/oying-common/src/main/java/com/oying/utils/R.java
@@ -1,4 +1,4 @@
-package com.oying.modules.pc.common.core.domain;
+package com.oying.utils;
 
 import java.io.Serializable;
 

--
Gitblit v1.9.3