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

# Conflicts:
#	src/main/java/com/ai/da/mapper/entity/SysFile.java

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

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

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

@@ -93,4 +93,9 @@ public class DesignItemDetail implements Serializable {
      * 更新时间
      */
     private Date updateDate;
+
+    /**
+     * 逻辑删除 1->删除 0->未删除  默认null
+     */
+    private Byte isDeleted;
 }

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

@@ -0,0 +1,55 @@
+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 java.time.LocalDateTime;
+
+@Data
+@TableName("t_design_item_detail_print")
+public class DesignItemDetailPrint {
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 关联t_design_item_detail表ID
+     */
+    private Long designItemDetailId;
+    /**
+     * 印花路径
+     */
+    private String path;
+    /**
+     * 印花位置
+     */
+    private String position;
+    /**
+     * 印花缩放比例
+     */
+    private Double scale;
+    /**
+     * 印花旋转角度
+     */
+    private Double angle;
+    /**
+     * 印花优先级（多个印花）
+     */
+    private Integer priority;
+    /**
+     * 选择single or overall 模式
+     */
+    private String singleOrOverall;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+}

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

@@ -67,8 +67,6 @@ public class SysFile implements Serializable {
      */
     private Date updateDate;
 
-//    private Integer isCopy;
-
     public SysFile() {
     }
 

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

@@ -71,6 +71,11 @@ public class TDesignPythonOutfitDetail implements Serializable {
      */
     @ApiModelProperty(value = "位置")
     private String position;
+    /**
+     * 图层缩放大小
+     */
+    @ApiModelProperty(value = "图层缩放大小")
+    private String scale;
     /**
      * 用户ID
      */