Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java

@@ -66,7 +66,7 @@ public class QuoteGroupDetailServiceImpl extends ServiceImpl<QuoteGroupDetailMap
         QuoteDetail quoteDetail = new QuoteDetail();
         // 复制属性
         BeanUtils.copyProperties(quoteGroupDetail,quoteDetail);
-        this.save(quoteGroupDetail);// 新增并返回ID
+        save(quoteGroupDetail);// 新增并返回ID
         quoteDetail.setQuoteGroupDetailId(quoteGroupDetail.getId());
         return quoteDetailService.saveQuoteDetail(quoteDetail);
     }

src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java

@@ -249,6 +249,8 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setPartDesc(quotation.getPartName());
 
             detail.setInternalInquiryNo(quote.getInsideInquiryNo());
+
+            // 数量
 //            detail.setQty(BigDecimal.ONE);
             detail.setQty(quotation.getQty());
             detail.setActive("Y");