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
This commit is contained in:
xupei
2023-09-14 14:19:34 +08:00
36 changed files with 777 additions and 192 deletions

View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ai.da.mapper.PythonTAllInfoMapper">
<resultMap type="com.ai.da.mapper.entity.PythonTAllInfo" id="PythonTAllInfoMap">
<id column="id" property="id"/>
<result property="imagePath" column="image_path"/>
<result property="imageCategory" column="image_category"/>
<result property="necklineLeft" column="neckline_left"/>
<result property="necklineRight" column="neckline_right"/>
<result property="centerFront" column="center_front"/>
<result property="shoulderLeft" column="shoulder_left"/>
<result property="shoulderRight" column="shoulder_right"/>
<result property="armpitLeft" column="armpit_left"/>
<result property="armpitRight" column="armpit_right"/>
<result property="waistlineLeft" column="waistline_left"/>
<result property="waistlineRight" column="waistline_right"/>
<result property="cuffLeftIn" column="cuff_left_in"/>
<result property="cuffLeftOut" column="cuff_left_out"/>
<result property="cuffRightIn" column="cuff_right_in"/>
<result property="cuffRightOut" column="cuff_right_out"/>
<result property="topHemLeft" column="top_hem_left"/>
<result property="topHemRight" column="top_hem_right"/>
<result property="waistbandLeft" column="waistband_left"/>
<result property="waistbandRight" column="waistband_right"/>
<result property="hemlineLeft" column="hemline_left"/>
<result property="hemlineRight" column="hemline_right"/>
<result property="crotch" column="crotch"/>
<result property="bottomLeftIn" column="bottom_left_in"/>
<result property="bottomLeftOut" column="bottom_left_out"/>
<result property="bottomRightIn" column="bottom_right_in"/>
<result property="bottomRightOut" column="bottom_right_out"/>
<result property="md5" column="md5"/>
<result property="maskPath" column="mask_path"/>
<result property="segResultPath" column="seg_result_path"/>
</resultMap>
</mapper>

View File

@@ -13,6 +13,7 @@
<result column="image_url" property="imageUrl"/>
<result column="mask_url" property="maskUrl"/>
<result column="position" property="position"/>
<result column="imageSize" property="image_size"/>
<result column="user_id" property="userId"/>
<result column="create_date" property="createDate"/>
<result column="update_date" property="updateDate"/>

View File

@@ -5,6 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="tDesignPythonOutfitResultMap" type="com.ai.da.mapper.entity.TDesignPythonOutfit">
<id column="id" property="id"/>
<result column="design_item_id" property="designItemId"/>
<result column="design_id" property="designId"/>
<result column="collection_id" property="collectionId"/>
<result column="design_url" property="designUrl"/>