Merge branch 'dev/dev' into dev/dev_xp

# Conflicts: # src/main/java/com/ai/da/service/GenerateService.java
2024-06-25 16:59:41 +08:00
parent be001477ce 8c65592394
commit e614e3a07a
13 changed files with 339 additions and 90 deletions
--- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java
@@ -39,4 +39,7 @@ public class ToProductImageResult implements Serializable {

    @ApiModelProperty(value = "userLikeGroupId")
    private Long userLikeGroupId;
+
+    @ApiModelProperty(value = "generate 结果类型")
+    private String resultType;
 }