Merge remote-tracking branch 'origin/feature/groupCourseSearch' into feature/groupCourseSearch

# Conflicts: # gym-manage-api/gym-member/pom.xml # gym-manage-api/manage-app/src/main/resources/application.yml
完成模块2
2026-06-02 17:25:26 +08:00 · 2026-06-02 17:18:21 +08:00 · 2026-06-02 17:18:21 +08:00 · 2026-06-02 17:18:17 +08:00 · 2026-06-02 17:17:45 +08:00 · 2026-06-02 17:17:04 +08:00
2 changed files with 1 additions and 1 deletions
@@ -128,7 +128,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
        </dependency>
-        <!-- Redis响应式支持（会员卡模块需要） -->

    </dependencies>

@@ -56,6 +56,7 @@ spring:
    import: classpath:member-config.yml


+
 management:
  endpoints:
    web:
Author	SHA1	Message	Date
liwentao	526cc25e0e	Merge remote-tracking branch 'origin/feature/groupCourseSearch' into feature/groupCourseSearch # Conflicts: # gym-manage-api/gym-member/pom.xml # gym-manage-api/manage-app/src/main/resources/application.yml	2026-06-02 17:25:26 +08:00
liwentao	8af444b7ee	完成模块2	2026-06-02 17:18:21 +08:00
liwentao	bdcd3b2bf0	移除已废弃的RedisConfig和RedisService	2026-06-02 17:18:21 +08:00
liwentao	544ddeec5a	增加Redis缓存功能注：/api/groupCourse/cache/get接口为测试接口	2026-06-02 17:18:17 +08:00
liwentao	2f070e6b44	将团课相关代码迁移至gym-GroupCourse模块	2026-06-02 17:17:45 +08:00
liwentao	de01a39848	完成团课查找功能	2026-06-02 17:17:04 +08:00
liwentao	03991319fd	完成模块2-2.1团课预约	2026-06-02 17:14:06 +08:00
liwentao	a8c7a4061e	增加Redis缓存功能注：/api/groupCourse/cache/get接口为测试接口	2026-06-02 17:13:42 +08:00
liwentao	0d2ed2aba5	移除测试用接口	2026-06-02 17:13:42 +08:00
liwentao	906512f294	将团课相关代码迁移至gym-GroupCourse模块	2026-06-02 17:13:42 +08:00
liwentao	a7f699a8b4	完成团课查找功能 # Conflicts: # gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java # gym-manage-api/manage-app/src/main/resources/application-dev.yml # gym-manage-api/manage-app/src/main/resources/application.yml # Conflicts: # gym-manage-api/pom.xml	2026-06-02 17:13:35 +08:00
liwentao	2df598c0d8	将redis相关配置文件移动至common模块修复app模块下配置文件中默认用户名与密码	2026-05-31 14:49:24 +08:00