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

src/main/java/com/ai/da/model/dto/ContestantDTO.java

@@ -2,6 +2,7 @@ package com.ai.da.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -54,6 +55,9 @@ public class ContestantDTO {
      */
     @ApiModelProperty(value = "是否确认覆盖已存在记录", required = false, example = "false")
     private Boolean confirm = false;
+
+    @NotBlank
+    private String secureToken;
 }
 
 

src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java

@@ -73,10 +73,10 @@ public class DesignSingleItemDTO implements Serializable {
     @Schema(description = "45")
     private double rotate;
 
-    @Schema(description = "带overall印花未分割图片")
+    /*@Schema(description = "带overall印花未分割图片")
     private String undividedLayerBase64;
 
     @Schema(description = "带overall/single印花未分割图片")
-    private String undividedLayerWithSinglePrintBase64;
+    private String undividedLayerWithSinglePrintBase64;*/
 
 }