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

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
/**
* 数据传输对象实体类
*
* @author Arcana
* @author SHAHAIBO
* @since 2023-08-01
*/
@Data