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

@@ -147,7 +147,7 @@ public class AfterSaleController {
     @GetMapping("/after_saleByMer")
     @Operation(summary = "新增接口20240410-售后信息-商户查询售后")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<List<AfterSaleDetailRespVO>> afterSale() {
+    public CommonResult<List<AfterSaleBaseVO>> afterSale() {
         List<AfterSaleDO> afterSaleDOS = afterSaleService.getAfterSaleByMerAndShop() ;
         return success(AfterSaleConvert.INSTANCE.convertList02(afterSaleDOS));
     }
@@ -156,7 +156,7 @@ public class AfterSaleController {
     @Operation(summary = "新增接口20240410-售后信息-商户根据商品号查询售后")
     @Parameter(name = "spuId", description = "商品ID", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<List<AfterSaleDetailRespVO>> afterSaleByPro(@RequestParam("spuId") Long spuId) {
+    public CommonResult<List<AfterSaleBaseVO>> afterSaleByPro(@RequestParam("spuId") Long spuId) {
         List<AfterSaleDO> afterSaleDOS = afterSaleService.getAfterSaleByProId(spuId);
         return success(AfterSaleConvert.INSTANCE.convertList02(afterSaleDOS));
     }