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

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/service/impl/SharePutOnShelvesServiceImpl.java

@@ -961,7 +961,7 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 			goodsDesc.setWhetherIntegral("0");
 			goodsDesc.setShared(1);
 			if (!goodsDescList.isEmpty()) {
-				PjGoodsDesc goodsDetail = goodsDescList.stream().filter(e -> e.getCode().equals(item.getGoodsName())).findFirst().orElse(null);
+				PjGoodsDesc goodsDetail = goodsDescList.stream().filter(e -> e.getCode().equals(item.getGoodsCode())).findFirst().orElse(null);
 				if (goodsDetail == null) {
 					goodsDescListNew.add(goodsDesc);
 				}