From 4624b6fd58f262ab95f2d60472560b9fc162d677 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 01 四月 2025 14:56:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/entity/IndItemDerEntity.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/entity/IndItemDerEntity.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/entity/IndItemDerEntity.java
index 6c04a37..0e2591f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/entity/IndItemDerEntity.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/entity/IndItemDerEntity.java
@@ -1,11 +1,10 @@
package com.iailab.module.data.ind.item.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
+import java.sql.Date;
/**
* 派生指标
@@ -36,25 +35,32 @@
/**
* 时间标识
*/
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String timeLabel;
/**
* 时间限定
*/
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String timeLimit;
/**
* 开始时间
*/
- private String timeStart;
+ private Date timeStart;
/**
* 结束时间
*/
- private String timeEnd;
+ private Date timeEnd;
/**
* 分析维度
*/
private String dimension;
+
+ /**
+ * 月周期开始日
+ */
+ private Integer monthStart;
}
\ No newline at end of file
--
Gitblit v1.9.3