fix: 合并回款与收付款方式相关修复

gongchunyi

9 天以前 d3bd74b5e0d6b768ba87111e87969827c704732f

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

@@ -7,13 +7,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -24,16 +25,16 @@
 * @author 芯导软件（江苏）有限公司
 * @since 2026-01-15 02:57:29
 */
@Api(tags = "借款信息表")
@Tag(name = "借款信息表")
@RestController
@RequestMapping("/borrowInfo")
@AllArgsConstructor
public class BorrowInfoController {

    @Autowired
    private BorrowInfoService borrowInfoService;

    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    @Operation(summary = "分页查询")
    public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
        return borrowInfoService.listPage(page,borrowInfo);
    }
@@ -73,7 +74,7 @@
     * 导出
     */
    @PostMapping("/export")
    @ApiOperation(value = "导出借款信息")
    @Operation(summary = "导出借款信息")
    public void export(HttpServletResponse response, BorrowInfo borrowInfo) {
        List<BorrowInfo> list = borrowInfoService.list();
        ExcelUtil<BorrowInfo> util = new ExcelUtil<>(BorrowInfo.class);