From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java | 2 +-
1 files changed, 1 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..ae804d7 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
@@ -61,7 +61,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