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

# Conflicts:
#	src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java

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

@@ -0,0 +1,19 @@
+package com.ai.da.mapper;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.entity.PythonTAllInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * (PythonTAllInfo)表数据库访问层
+ *
+ * @author SHAHAIBO
+ * @since 2023-09-08 17:05:24
+ */
+public interface PythonTAllInfoMapper extends CommonMapper<PythonTAllInfo> {
+
+}
+

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

@@ -0,0 +1,10 @@
+package com.ai.da.mapper.entity;
+
+import lombok.Data;
+
+@Data
+public class ObjectItem {
+    private String objectName;
+    private Long size;
+}
+

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

@@ -0,0 +1,86 @@
+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.io.Serializable;
+
+/**
+ * (PythonTAllInfo)实体类
+ *
+ * @author SHAHAIBO
+ * @since 2023-09-08 17:05:25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("python_t_all_info")
+public class PythonTAllInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String imagePath;
+
+    private String imageCategory;
+
+    private String necklineLeft;
+
+    private String necklineRight;
+
+    private String centerFront;
+
+    private String shoulderLeft;
+
+    private String shoulderRight;
+
+    private String armpitLeft;
+
+    private String armpitRight;
+
+    private String waistlineLeft;
+
+    private String waistlineRight;
+
+    private String cuffLeftIn;
+
+    private String cuffLeftOut;
+
+    private String cuffRightIn;
+
+    private String cuffRightOut;
+
+    private String topHemLeft;
+
+    private String topHemRight;
+
+    private String waistbandLeft;
+
+    private String waistbandRight;
+
+    private String hemlineLeft;
+
+    private String hemlineRight;
+
+    private String crotch;
+
+    private String bottomLeftIn;
+
+    private String bottomLeftOut;
+
+    private String bottomRightIn;
+
+    private String bottomRightOut;
+
+    private String md5;
+
+    private String maskPath;
+
+    private String segResultPath;
+}
+

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

@@ -31,6 +31,11 @@ public class TDesignPythonOutfit implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    private Long designItemId;
+    /**
+     * designItemId
+     */
+    @ApiModelProperty(value = "designItemId")
     private Long designItemId;
     /**
      * 关联的design ID

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

@@ -53,6 +53,11 @@ public class TDesignPythonOutfitDetail implements Serializable {
 
     @ApiModelProperty(value = "图层大小")
     private String imageSize;
+    /**
+     * imageSize
+     */
+    @ApiModelProperty(value = "imageSize")
+    private String imageSize;
     /**
      * 对应的图片的绝对路径
      */

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

@@ -62,6 +62,11 @@ public class Workspace implements Serializable {
      */
     @ApiModelProperty(value = "人体模型")
     private String mannequin;
+    /**
+     * 最后使用的工作空间标识
+     */
+    @ApiModelProperty(value = "最后使用的工作空间标识")
+    private Integer isLastIndex;
     /**
      * 创建时间
      */