From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-generator/src/main/java/com/oying/rest/GenConfigController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/oying-generator/src/main/java/com/oying/rest/GenConfigController.java b/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
index 65a788e..f4ff590 100644
--- a/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
+++ b/oying-generator/src/main/java/com/oying/rest/GenConfigController.java
@@ -2,6 +2,7 @@
import com.oying.domain.GenConfig;
import com.oying.service.GenConfigService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -24,13 +25,13 @@
@ApiOperation("查询")
@GetMapping(value = "/{tableName}")
- public ResponseEntity<GenConfig> queryGenConfig(@PathVariable String tableName){
- return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK);
+ public ResponseEntity<Object> queryGenConfig(@PathVariable String tableName) {
+ return new ResponseEntity<>(R.success(genConfigService.find(tableName)), HttpStatus.OK);
}
@PutMapping
@ApiOperation("修改")
- public ResponseEntity<GenConfig> updateGenConfig(@Validated @RequestBody GenConfig genConfig){
- return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK);
+ public ResponseEntity<Object> updateGenConfig(@Validated @RequestBody GenConfig genConfig) {
+ return new ResponseEntity<>(R.success(genConfigService.update(genConfig.getTableName(), genConfig)), HttpStatus.OK);
}
}
--
Gitblit v1.9.3