From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java
index 3845057..d3046e3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java
@@ -31,8 +31,8 @@
/**
* 配置id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ @TableId(value = "config_id", type = IdType.AUTO)
+ private Long configId;
/**
* 删除标记
*/
@@ -41,19 +41,23 @@
/**
* 配置类型
*/
- private Integer type;
+ @TableField("config_type")
+ private Integer configType;
/**
* 配置键
*/
- private String key;
+ @TableField("config_key")
+ private String configKey;
/**
* 配置名
*/
- private String name;
+ @TableField("config_name")
+ private String configName;
/**
* 配置值
*/
- private String value;
+ @TableField("config_value")
+ private String configValue;
/**
* 创建时间
*/
@@ -68,7 +72,7 @@
@Override
protected Serializable pkVal() {
- return this.id;
+ return this.configId;
}
}
--
Gitblit v1.7.1