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

云

5 天以前 dc9c6c612cde7b938c6851383b9da99abab025a4

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

@@ -6,10 +6,11 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
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 org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

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

    @Autowired
    private BorrowInfoService borrowInfoService;

    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
    @Operation(summary = "分页查询")
    public R<?> listPage(Page page, BorrowInfo borrowInfo) {
        return borrowInfoService.listPage(page,borrowInfo);
    }

@@ -44,7 +45,7 @@
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "新增借款信息", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody BorrowInfo borrowInfo) {
    public R<?> add(@RequestBody BorrowInfo borrowInfo) {
        return borrowInfoService.add(borrowInfo);
    }

@@ -54,7 +55,7 @@
    @PostMapping("/update")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "修改借款信息", businessType = BusinessType.UPDATE)
    public AjaxResult updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
    public R<?> updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
        return borrowInfoService.updateBorrowInfo(borrowInfo);
    }

@@ -65,7 +66,7 @@
    @DeleteMapping("/delete")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "删除借款信息", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
    public R<?> delete(@RequestBody List<Long> ids) {
        return borrowInfoService.delete(ids);
    }

@@ -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);