Go to file
shi d1be064c7b Merge remote-tracking branch 'origin/upgrade_s1' into main-pp
# Conflicts:
#	ff-bean/ff-domain/src/main/java/com/ff/agent/domain/TenantAgentCommission.java
#	ff-bean/ff-domain/src/main/java/com/ff/game/service/impl/GameExchangeMoneyServiceImpl.java
#	ff-game/src/main/java/com/ff/api/controller/ApiGameController.java
#	ff-game/src/main/java/com/ff/base/enums/TimeOutType.java
#	ff-game/src/main/java/com/ff/base/enums/TriggerType.java
#	ff-game/src/main/java/com/ff/base/manager/AsyncManager.java
#	ff-game/src/main/java/com/ff/game/api/fc/impl/GamesFCServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/ng/service/impl/GamesPGServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/pgt/impl/GamesPGTServiceImpl.java
#	ff-game/src/main/java/com/ff/game/api/pgx/impl/GamesPGXServiceImpl.java
#	ff-game/src/main/java/com/ff/quartz/task/GameTask.java
#	ff-game/src/main/java/com/ff/tenant/service/impl/TenantGameQuotaBizImpl.java
#	ff-game/src/main/resources/mapper/game/GameMapper.xml
2025-04-12 14:50:20 +08:00
ff-bean Merge remote-tracking branch 'origin/upgrade_s1' into main-pp 2025-04-12 14:50:20 +08:00
ff-fetcher refactor(xk-dbsports): 重构项目依赖和目录结构- 新增 ff-util 模块,包含通用工具类 2025-04-12 10:57:14 +08:00
ff-game Merge remote-tracking branch 'origin/upgrade_s1' into main-pp 2025-04-12 14:50:20 +08:00
ff-platform/xk-dbsports refactor(exception): 新增自定义异常类并重构异常处理 2025-04-12 13:15:53 +08:00
sh feat(platform): 新增 DBSports体育平台支持 2025-04-12 10:31:09 +08:00
sql refactor(工程): 调整工程代码结构 2025-04-11 19:22:49 +08:00
.gitignore chore: 添加 .gitignore 文件 2025-03-31 14:51:25 +08:00
pom.xml refactor(exception): 新增自定义异常类并重构异常处理 2025-04-12 13:15:53 +08:00