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

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -278,7 +278,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 return item;
             } else {// 插入
                 inquiry = saleInquiries.get(0);
-                PublicInquiryItem purcItem = infoDao.findByVendUUAndSourceId(inquiryItem.getVendUU(), inquiryItem.getSourceId());
+                PublicInquiryItem purcItem = infoDao.findByVendUUAndSourceId(inquiryItem.getVendUU(), inquiryItem.getId());
                 if (purcItem != null) {
                     throw new Exception("询价单已存在，不允许再次报价");
                 } else {