Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-27 8121d4d29d0d2802954035f20a6d315f25f66fb7

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java

@@ -584,6 +584,7 @@
                    if (data1!=null){
                        tShoppingOrder.setName(data1.getName());
                    }
                    tShoppingOrder.setStatus(3);
                    break;
            }
            if (tShoppingOrder.getAppUserId() != null){