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

Browse Source

# 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

parent cf771a5b77 e007d2353e

commit 01cdbf99f9

36 changed files with 777 additions and 192 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

16

src/main/java/com/ai/da/python/PythonService.java

File diff suppressed because one or more lines are too long