Merge branch 'dev/dev' into dev/dev_shb

# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java
#	src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
#	src/main/java/com/ai/da/service/AccountService.java
#	src/main/java/com/ai/da/service/LibraryService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
#	src/main/resources/application-prod.properties
#	src/main/resources/application-test.properties

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

@@ -27,6 +27,11 @@ public class Generate {
      */
     private Long accountId;
 
+    /**
+     * 唯一id
+     */
+    private String uniqueId;
+
     /**
      * Sketchboard  Printboard
      */

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

@@ -0,0 +1,44 @@
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_generate_cancel")
+public class GenerateCancel {
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long accountId;
+
+    /**
+     * 唯一id(任务id)
+     */
+    private String uniqueId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    public GenerateCancel(Long accountId, String uniqueId, Date createDate) {
+        this.accountId = accountId;
+        this.uniqueId = uniqueId;
+        this.createDate = createDate;
+    }
+}