litianxiang 40518cab37 Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev-ltx ...

# Conflicts:
#	src/main/java/com/ai/da/controller/GlobalAwardController.java
#	src/main/java/com/ai/da/model/dto/ContestantDTO.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-prod.properties

2026-01-20 16:20:41 +08:00

..

main

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev-ltx

2026-01-20 16:20:41 +08:00