From 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 16:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/account/controller/AccountSubjectController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java b/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java
index acf373a..38dd0ce 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountSubjectController.java
@@ -31,9 +31,9 @@
public class AccountSubjectController {
private final AccountSubjectService accountSubjectService;
- @GetMapping("list")
+ @GetMapping("/list")
@Log(title = "鎬昏处绉戠洰鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- @Operation(summary = "鎬昏处绉戠洰鍒嗛〉鏌ヨ")
+ @Operation(summary = "鎬昏处绉戠洰鏍戝舰鏌ヨ锛堥�掑綊锛�")
public R<IPage<AccountSubjectVo>> AccountSubjectDtoList(Page<AccountSubjectDto> page, AccountSubjectDto accountSubjectDto) {
IPage<AccountSubjectVo> paramList = accountSubjectService.baseList(page, accountSubjectDto);
return R.ok(paramList);
@@ -43,21 +43,21 @@
@Log(title = "鏂板鎬昏处绉戠洰", businessType = BusinessType.INSERT)
@Operation(summary = "鏂板鎬昏处绉戠洰")
public R AccountSubjectDtoAdd(@RequestBody AccountSubjectDto accountSubjectDto) {
- return R.ok(accountSubjectService.save(accountSubjectDto));
+ return R.ok(accountSubjectService.saveAccountSubject(accountSubjectDto));
}
@PutMapping("/edit")
@Log(title = "淇敼鎬昏处绉戠洰", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼鎬昏处绉戠洰")
public R AccountSubjectDtoEdit(@RequestBody AccountSubjectDto accountSubjectDto) {
- return R.ok(accountSubjectService.updateById(accountSubjectDto));
+ return R.ok(accountSubjectService.updateAccountSubject(accountSubjectDto));
}
@DeleteMapping("/remove/{ids}")
@Log(title = "鍒犻櫎鎬昏处绉戠洰", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎鎬昏处绉戠洰")
public R AccountSubjectDtooRemove(@PathVariable Long[] ids) {
- return R.ok(accountSubjectService.removeBatchByIds(Arrays.asList(ids)));
+ return R.ok(accountSubjectService.removeAccountSubjectByIds(Arrays.asList(ids)));
}
@PostMapping("/export")
--
Gitblit v1.9.3