Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts: # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
2023-09-13 10:34:09 +08:00
parent 7a6d70c2cf 41111bc0e4
commit a08300f095
101 changed files with 1597 additions and 346 deletions
--- a/src/main/java/com/ai/da/service/DesignService.java
+++ b/src/main/java/com/ai/da/service/DesignService.java
@@ -75,5 +75,5 @@ public interface DesignService extends IService<Design> {
     * @param designItemId
     * @return
     */
-    DesignItemDetailVO detail(Long designItemId);
+    DesignItemDetailVO detail(Long designPythonOutfitId,Long designItemId);
 }