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

This commit is contained in:
2024-12-27 10:32:09 +08:00

View File

@@ -985,7 +985,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
Design oldDesign = selectByCollectionId(reDesignDTO.getCollectionId()); Design oldDesign = selectByCollectionId(reDesignDTO.getCollectionId());
//删除老的关联的design //删除老的关联的design
deleteByCollectionId(reDesignDTO.getCollectionId()); deleteByCollectionId(reDesignDTO.getCollectionId());
designItemService.deleteByCollectionId(reDesignDTO.getCollectionId()); // designItemService.deleteByCollectionId(reDesignDTO.getCollectionId());
designItemDetailService.deleteByDesignId(oldDesign.getId()); designItemDetailService.deleteByDesignId(oldDesign.getId());
//redesign //redesign
return designOrRedesignOperateNew(CopyUtil.copyObject( return designOrRedesignOperateNew(CopyUtil.copyObject(