 liwentao
|
f5ca726ded
|
Merge remote-tracking branch 'origin/feature/data-count' into feature/data-count
# Conflicts:
# gym-manage-api/docs/datacount-api.md
# gym-manage-api/gym-dataCount/pom.xml
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/config/DataCountRouter.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/dao/StatisticsDao.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/StatisticsExportDTO.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/handler/DataCountHandler.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/scheduler/StatisticsDailyScheduler.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/IDataCountService.java
# gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/impl/DataCountServiceImpl.java
# gym-manage-api/log.text
# gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java
# gym-manage-api/pom.xml
|
2026-06-09 18:19:33 +08:00 |
|
|
liwentao
|
54a65b2a74
|
完善模块4，4.1基础数据统计
|
2026-06-09 18:16:56 +08:00 |
|
|
liwentao
|
9446f66567
|
完成模块4，4.1基础数据统计的部分功能
|
2026-06-09 18:16:29 +08:00 |
|
|
liwentao
|
7465074eb7
|
完成模块4，4.1基础数据统计的部分功能
|
2026-06-09 17:32:33 +08:00 |
|
|
liwentao
|
8ab528a74b
|
修复web-application-type
|
2026-06-09 16:28:36 +08:00 |
|
|
liwentao
|
de7a359ead
|
将member-config.yml迁移至manage-app模块
删除重复的V6sql语句
|
2026-06-09 11:21:19 +08:00 |
|
|
liwentao
|
8958ffaa9e
|
完成模块4，4.1基础数据统计的部分功能
|
2026-06-06 15:19:40 +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 |
|
|
liwentao
|
3d284c8d3a
|
将查询用户个人信息与更新用户信息迁移至gym-member模块
|
2026-05-10 20:40:25 +08:00 |
|