From ea578cf32a5cd9e7a1704df2938c4071e7309055 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 18:11:43 +0800
Subject: [PATCH] 处理冲突
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 4edbe33..8dfbef9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -39,7 +39,7 @@
/**
* 会员模块的serviceid
*/
- public static final String MEMBER_SERVICE = "ruoyi-member";
+ public static final String RUOYI_MEMBER = "ruoyi-member";
/**
--
Gitblit v1.7.1