Merge branch 'dev/dev_xp' into dev/3.1_release_merge

src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

@@ -974,8 +974,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                         log.error("未知designItemDetailId: {}", item.getId());
                         throw new BusinessException("designItemDetails.not.found");
                     } else if (StringUtil.isNullOrEmpty(designItemDetail.getPartialDesign())) {
-                        log.error("merge模式下，必须提供partialDesign");
-                        throw new BusinessException("required.partialDesign");
+                        item.setPartialDesign(new PartialDesignDTO(designItemDetail.getUndividedLayer()));
+                        /*log.error("merge模式下，必须提供partialDesign");
+                        throw new BusinessException("required.partialDesign");*/
                     } else {
                         item.setPartialDesign(new PartialDesignDTO(designItemDetail.getPartialDesign()));
                     }