Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-25 d34a44a1ffa778c0a95027f67d56544b0faa4930

 src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java

@@ -5,7 +5,8 @@
import com.ruoyi.account.pojo.SalesRefundAmountOrder;
import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.framework.web.domain.R;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -23,9 +24,9 @@
 */
@RestController
@RequestMapping("/salesRefundAmountOrder")
@AllArgsConstructor
public class SalesRefundAmountOrderController {

    @Autowired
    private SalesRefundAmountOrderService salesRefundAmountOrderService;

    @GetMapping("/page")
@@ -33,7 +34,7 @@
        return R.ok(salesRefundAmountOrderService.pageSalesRefundAmountOrderDto(page, salesRefundAmountOrder));
    }

    @ApiOperation("处理")
    @Operation(summary = "处理")
    @PostMapping("/dispose")
    public R dispose( SalesRefundAmountOrderDto salesRefundAmountOrderId) {
        return R.ok(salesRefundAmountOrderService.dispose(salesRefundAmountOrderId));