Merge remote-tracking branch 'origin/master'

xuhy

2024-08-29 a47a2ec2b07bf5e4e6df6d27a6a80418e62e9b6b

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java

@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -35,7 +36,7 @@
     * @param query
     * @return
     */
    List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query);
    Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query);
    
    
    /**