Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/mapper/primary/CloudTaskMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.CloudTask;
+
+public interface CloudTaskMapper extends CommonMapper<CloudTask> {
+}

src/main/java/com/ai/da/mapper/primary/entity/CloudTask.java

@@ -0,0 +1,47 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.poi.hpsf.Decimal;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("cloud_task")
+public class CloudTask implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long projectId;
+
+    private Long collectionId;
+
+    private Long designId;
+
+    private String buildType;
+
+    private Integer nums;
+
+    private Integer completedNum;
+
+    private Decimal costCredits;
+
+    private Integer status;
+
+    private String taskId;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

src/main/java/com/ai/da/mapper/primary/entity/Project.java

@@ -35,6 +35,8 @@ public class Project implements Serializable {
 
     private Long originalPortfolioId;
 
+    private Long parentId;
+
     private LocalDateTime createTime;
 
     private LocalDateTime updateTime;