summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanghao <admin@LAPTOP-QCSKVLI9>2021-04-07 09:26:21 +0800
committertanghao <admin@LAPTOP-QCSKVLI9>2021-04-07 09:26:21 +0800
commit6cb6d13cff231b166e398c23ec50aacdfb526e08 (patch)
tree9ee934fc57732eeef7d99a3567cbda3753ab9db6
parentf5d1f5e0f3866223d0f307541d883d3f308558d4 (diff)
fix: 机柜sql语句修改以及返回参数key值修改
-rw-r--r--nz-admin/src/main/java/com/nis/modules/asset/controller/AssetFieldGroupController.java4
-rw-r--r--nz-admin/src/main/resources/db/V2021.04.06__1.Insert dc table 2. idc_id was renamed to dc_id .sql2
2 files changed, 2 insertions, 4 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/asset/controller/AssetFieldGroupController.java b/nz-admin/src/main/java/com/nis/modules/asset/controller/AssetFieldGroupController.java
index c4faf1c2..50394241 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/controller/AssetFieldGroupController.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/controller/AssetFieldGroupController.java
@@ -60,7 +60,7 @@ public class AssetFieldGroupController {
.and(assetFieldGroup.getName()).notNull(RCode.ASSET_FIELD_GROUP_NAME_ISNULL);
Integer id = assetFieldGroupService.saveOrModifyAssetFieldGroup(assetFieldGroup);
- return R.ok().putData("data", id);
+ return R.ok().putData("id", id);
}
@PostMapping
@@ -72,7 +72,7 @@ public class AssetFieldGroupController {
Integer id = assetFieldGroupService.saveOrModifyAssetFieldGroup(assetFieldGroup);
- return R.ok().putData("data", id);
+ return R.ok().putData("id", id);
}
@DeleteMapping
diff --git a/nz-admin/src/main/resources/db/V2021.04.06__1.Insert dc table 2. idc_id was renamed to dc_id .sql b/nz-admin/src/main/resources/db/V2021.04.06__1.Insert dc table 2. idc_id was renamed to dc_id .sql
index f4789d68..1f23910e 100644
--- a/nz-admin/src/main/resources/db/V2021.04.06__1.Insert dc table 2. idc_id was renamed to dc_id .sql
+++ b/nz-admin/src/main/resources/db/V2021.04.06__1.Insert dc table 2. idc_id was renamed to dc_id .sql
@@ -32,8 +32,6 @@ ALTER TABLE `cabinet` CHANGE COLUMN `idc_id` `dc_id` int(11) NOT NULL COMMENT '�
ALTER TABLE `prom_server` CHANGE COLUMN `idc_id` `dc_id` int(11) NOT NULL COMMENT '数据中心id';
-rename table expression_tmpl to visual_expression_tmpl;
-
DROP TABLE IF EXISTS `visual_chart`;
CREATE TABLE `visual_chart` (
`id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键',