From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 07 三月 2025 11:40:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java index 1189c00..70680e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.system.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; @@ -15,7 +16,7 @@ * </p> * * @author xiaochen - * @since 2025-01-17 + * @since 2025-01-20 */ @Data @EqualsAndHashCode(callSuper = false) @@ -25,15 +26,15 @@ private static final long serialVersionUID = 1L; - @TableId("id") + @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; @ApiModelProperty(value = "系统名称") - @TableField("systemName") + @TableField("system_name") private String systemName; @ApiModelProperty(value = "公司名称") - @TableField("companyName") + @TableField("company_name") private String companyName; @ApiModelProperty(value = "联系方式") -- Gitblit v1.7.1