Merge remote-tracking branch 'origin/master'

xuhy

2024-09-13 cb02f43ad81fd2ce3e1c3e0cd95234746b7927ad

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

@@ -9,6 +9,7 @@
import com.ruoyi.order.dto.MyExchangeOrderList;

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

/**
 * <p>
@@ -26,7 +27,7 @@
    * @param query
    * @return
    */
   List<MyExchangeOrderList> getMyExchangeOrder(GetMyExchangeOrder query);
   Map<String, Object> getMyExchangeOrder(GetMyExchangeOrder query);
   
   
   /**