From 2b23ece9828267329ffc5c38dd96da8157897055 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 17:32:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XinQuanHealing
---
xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/web/domain/BaseModel.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/web/domain/BaseModel.java b/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/web/domain/BaseModel.java
index 694c891..8320180 100644
--- a/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/web/domain/BaseModel.java
+++ b/xinquan-common/xinquan-common-core/src/main/java/com/xinquan/common/core/web/domain/BaseModel.java
@@ -19,24 +19,24 @@
/** 创建者 */
@ApiModelProperty(value = "记录创建人，前端忽略")
- @TableField(value = "createBy", fill = FieldFill.INSERT)
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@ApiModelProperty(value = "记录创建时间，前端忽略")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField(value = "createTime", fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private LocalDateTime createTime;
/** 更新者 */
@ApiModelProperty(value = "记录修改人，前端忽略")
- @TableField(value = "updateBy", fill = FieldFill.INSERT_UPDATE)
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */
@ApiModelProperty(value = "记录修改时间，前端忽略")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+ // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/** 是否删除 0未删除 1已删除 */
--
Gitblit v1.7.1