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

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -224,6 +224,7 @@ public class StoreManagementService implements IStoreManagementService {
                 refundAddr.setUpdateTime(new Date());
                 refundAddrService.save(refundAddr);
             }
+//            resultData.put("thirdPartyId",shopDetailInfo.getShopId());//推送第三方id
 //            String post =null;
 //            try {
 //                 post = HttpUtil.post(smqjhMdUrlAddAndUpdate, goodsInfoJson);