From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 10 九月 2024 17:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
index 7355249..e91c0d9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
@@ -39,6 +39,11 @@
@TableField("count_type")
private String countType;
+ /** 閿�煎搴擸wThreadConstants */
+ @Excel(name = "閿��")
+ @TableField("`key`")
+ private String key;
+
/** 闃堝�煎悕 */
@Excel(name = "闃堝�煎悕")
@TableField("name")
@@ -61,7 +66,7 @@
/** 閫昏緫鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎 */
@Excel(name = "閫昏緫鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎")
- private String deleted;
+ private Integer deleted;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.8.0