Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

src/main/java/com/ai/da/mapper/GenerateDetailMapper.java

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

src/main/java/com/ai/da/mapper/GenerateMapper.java

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

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

@@ -0,0 +1,65 @@
+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")
+public class Generate {
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long accountId;
+
+    /**
+     * Sketchboard  Printboard
+     */
+    private String level1Type;
+
+    /**
+     * 关联collection element id
+     */
+    private Long collectionElementId;
+
+    /**
+     * caption的内容
+     */
+    private String text;
+
+    /**
+     * 选择生成类型：text、image、text-image
+     */
+    private String generateType;
+
+    /**
+     * 模型名
+     */
+    private String modelName;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+}

src/main/java/com/ai/da/mapper/entity/GenerateDetail.java

@@ -0,0 +1,54 @@
+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_detail")
+public class GenerateDetail {
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 关联 generate ID
+     */
+    private Long generateId;
+
+    /**
+     * 模型返回的图片url
+     */
+    private String url;
+
+    /**
+     * 是否喜欢   0：dislike  1:like
+     */
+    private Byte isLike;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+
+
+
+
+}

src/main/java/com/ai/da/mapper/entity/PanTone.java

@@ -27,6 +27,7 @@ public class PanTone implements Serializable {
     /**
      * pantone_index
      */
+    @TableId("pantone_index")
     private Integer pantoneIndex;
 
     /**