Merge branch 'dev/2024/0411/update-business' of Harper/feifan-backend-zx-business into master

修改查售后接口

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/AfterSaleController.java

@@ -29,7 +29,6 @@ import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
@@ -145,7 +144,7 @@ public class AfterSaleController {
     }
 
 
-    @GetMapping("/after_sale")
+    @GetMapping("/after_saleByMer")
     @Operation(summary = "新增接口20240410-售后信息-商户查询售后")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
     public CommonResult<List<AfterSaleDetailRespVO>> afterSale() {