From 11a7080101bb5e2877d659ff0ab50396c8b47eac Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 12 May 2023 09:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basic/entity/BasicTenantCodeEntity.java | 2 +- .../com/logpm/basic/controller/BasicTenantCodeController.java | 4 +--- .../java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml | 4 ++-- .../logpm/basic/service/impl/BasicTenantCodeServiceImpl.java | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java index db75a9f1e..6379b8177 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java @@ -36,7 +36,7 @@ import java.io.Serializable; * @since 2023-05-08 */ @Data -@TableName("logpm_basicdata_tenant_code") +@TableName("logpm_basic_tenant_code") @ApiModel(value = "BasicTenantCode对象", description = "租户设置编码") public class BasicTenantCodeEntity extends TenantEntity implements Serializable{ diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java index 0a41fb463..f2c6972af 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java @@ -53,7 +53,7 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @AllArgsConstructor -@RequestMapping("/TenantCode") +@RequestMapping("/tenantCode") @Api(value = "租户设置编码", tags = "租户设置编码接口") public class BasicTenantCodeController extends BladeController { @@ -101,7 +101,6 @@ public class BasicTenantCodeController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicTenantCode") public R save(@Valid @RequestBody BasicTenantCodeEntity basicTenantCode) { - return R.status(basicTenantCodeService.save(basicTenantCode)); } @@ -122,7 +121,6 @@ public class BasicTenantCodeController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicTenantCode") public R submit(@Valid @RequestBody BasicTenantCodeEntity basicTenantCode) { - return R.status(basicTenantCodeService.saveOrUpdate(basicTenantCode)); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml index 9085085c4..40a2ccd18 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicTenantCodeMapper.xml @@ -36,7 +36,7 @@ reserve4, reserve5 from - logpm_basicdata_tenant_code + logpm_basic_tenant_code is_deleted = 0 @@ -68,7 +68,7 @@ reserve4, reserve5 FROM - logpm_basicdata_tenant_code + logpm_basic_tenant_code id = #{id} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java index 4a198afed..deb28b81c 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java @@ -75,5 +75,4 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl