Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java

@@ -76,7 +76,7 @@
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            appShoppingCartAddDto.setUserId(userId);
            if(member!=null&&member.getRelationShopId()!=null){
            if(appShoppingCartAddDto.getShopId()==null&&member!=null&&member.getRelationShopId()!=null){
                appShoppingCartAddDto.setShopId(member.getRelationShopId());
            }
        }