aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
litianxiang
2026-01-20 16:20:41 +08:00
parent 46d61cb73f 08f20fd1fe
commit 40518cab37
13 changed files with 204 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/application-dev.properties
View File

@@ -181,4 +181,5 @@ file.upload.max.size.video=104857600
file.upload.task.expiry.hours=24
# MinIO配置
minio.bucket=contestants
minio.bucket=contestants
global.award.link=https://develop.aida.com.hk/