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

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -183,6 +183,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		tbGoodsTransit.setGoodsUnits(tbGoods.getUnit());
 		tbGoodsTransit.setGoodsType(tbGoods.getTypeNames());
 		tbGoodsTransit.setGoodsImg(tbGoods.getAvatar());
+		tbGoodsTransit.setGoodsId(tbGoods.getId());//保存监管商品表id
 		tbGoodsTransit.setShopId(transactionGoodsParam.getShopId());
 		tbGoodsTransit.setShopName(transactionGoodsParam.getShopName());