From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcSettingEntity.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/entity/ArcPointSettingEntity.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcSettingEntity.java
similarity index 77%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/entity/ArcPointSettingEntity.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcSettingEntity.java
index 02f61d7..57b08d1 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/entity/ArcPointSettingEntity.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/entity/ArcSettingEntity.java
@@ -1,4 +1,4 @@
-package com.iailab.module.data.point.entity;
+package com.iailab.module.data.arc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,10 +6,11 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("t_arc_setting")
-public class ArcPointSettingEntity implements Serializable {
+public class ArcSettingEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -40,6 +41,11 @@
private String calculate;
/**
+ * 排序
+ */
+ private Integer sort;
+
+ /**
* 是否启用
*/
private String isEnable;
@@ -47,10 +53,10 @@
/**
* 创建时间
*/
- private String createTime;
+ private Date createTime;
/**
* 更新时间
*/
- private String updateTime;
+ private Date updateTime;
}
--
Gitblit v1.9.3