Merge branch 'master' into test

hx-sale/src/main/java/com/fjhx/sale/entity/documents/po/DocumentsProduct.java

@@ -89,6 +89,6 @@ public class DocumentsProduct extends BasePo {
      * 产品ID
      */
     @TableField(exist = false)
-    private String productId;
+    private Long productId;
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -205,7 +205,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         //查询单证货物
         List<DocumentsProduct> documentsProducts = documentsProductService.getDpList(documents.getId());
         // 赋值产品属性
-        productInfoService.attributeAssign(documentsProducts, DocumentsProduct::getBusinessId, (item, product) -> {
+        productInfoService.attributeAssign(documentsProducts, DocumentsProduct::getProductId, (item, product) -> {
             item.setProductCode(product.getCode());
             item.setProductUnit(product.getUnit());
             item.setProductName(product.getName());