Merge branch 'dev/dev_xp' into dev/dev

This commit is contained in:
2025-08-20 18:02:18 +08:00
3 changed files with 12 additions and 1 deletions

View File

@@ -1,5 +1,7 @@
package com.ai.da.model.dto; package com.ai.da.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@@ -7,12 +9,16 @@ import javax.validation.constraints.Pattern;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
@ApiModel
public class EditReferralDTO { public class EditReferralDTO {
@NotNull(message = "referral id cannot be empty") @NotNull(message = "referral id cannot be empty")
@ApiModelProperty("指定需要修改的referral的id")
private Long id; private Long id;
@ApiModelProperty("修改佣金金额")
private BigDecimal amount; private BigDecimal amount;
@ApiModelProperty("referral状态 取值Paid/Unpaid/Accept/Rejected")
@Pattern(regexp = "Paid|Unpaid|Accept|Rejected", message = "状态必须是Paid/Unpaid/Accept/Rejected") @Pattern(regexp = "Paid|Unpaid|Accept|Rejected", message = "状态必须是Paid/Unpaid/Accept/Rejected")
private String status; private String status;
} }

View File

@@ -1,13 +1,18 @@
package com.ai.da.model.dto; package com.ai.da.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ApiModel
public class ReferralPageQueryDTO extends TimeQueryBaseDTO { public class ReferralPageQueryDTO extends TimeQueryBaseDTO {
@ApiModelProperty("推广者id")
private Long affiliateId; private Long affiliateId;
@ApiModelProperty("状态 取值Paid/Unpaid/Pending/Access/Rejected")
private String status; private String status;
} }

View File

@@ -2168,7 +2168,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
.model("wanx2.1-t2i-plus") .model("wanx2.1-t2i-plus")
.prompt(prompt) .prompt(prompt)
.n(1) .n(1)
.size("1024*1024") // .size("1024*1024") 采用默认值1328*1328默认值1:1。
.parameters(promptExtend) .parameters(promptExtend)
.build(); .build();