From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
index 8f0bd80..f09e973 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceGroup.java
@@ -32,10 +32,10 @@
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date updateTime;
- @TableField(value = "create_user",fill = FieldFill.INSERT)
- private String createUser;
- @TableField(value = "update_user", fill = FieldFill.UPDATE)
- private String updateUser;
+ @TableField(value = "create_by",fill = FieldFill.INSERT)
+ private String createBy;
+ @TableField(value = "update_by", fill = FieldFill.UPDATE)
+ private String updateBy;
@JsonIgnore
@TableLogic
@TableField(value = "delete_flag", select = false)
--
Gitblit v1.9.3