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/service/ITDesignPythonOutfitDetailService.java

@@ -2,10 +2,13 @@ package com.ai.da.service;
 
 
 import com.ai.da.mapper.entity.TDesignPythonOutfitDetail;
+import com.ai.da.model.vo.DesignPythonOutfitVO;
 import com.ai.da.model.vo.TDesignPythonOutfitDetailVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * design item详情表 服务类
  *
@@ -23,4 +26,12 @@ public interface ITDesignPythonOutfitDetailService extends IService<TDesignPytho
 	 */
 	IPage<TDesignPythonOutfitDetailVO> selectTDesignPythonOutfitDetailPage(IPage<TDesignPythonOutfitDetailVO> page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail);
 
+	/**
+	 * 通过DesignPythonOutfitId获取designPythonOutfitDetail
+	 * @param designPythonOutfitId
+	 * @return
+	 */
+	List<TDesignPythonOutfitDetail> getDetailByDesignPythonOutfitId(Long designPythonOutfitId);
+
+	DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail);
 }