game-api/ff-bean
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
..
comp-redis feat(redis): 新增 Redis 缓存工具类并替换现有缓存实现 2025-04-11 20:42:39 +08:00
ff-domain Merge remote-tracking branch 'origin/upgrade_s1' into main-pp 2025-04-12 14:50:20 +08:00
ff-exception feat(ff-exception): 添加异常处理模块的pom文件 2025-04-12 14:11:00 +08:00
ff-util refactor(exception): 新增自定义异常类并重构异常处理 2025-04-12 13:15:53 +08:00
xk-client refactor(exception): 新增自定义异常类并重构异常处理 2025-04-12 13:15:53 +08:00