From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
index 30e6c76..db32b02 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
@@ -63,7 +63,7 @@
private String updateUserName;
/** 閫昏緫鍒犻櫎 */
- private String deleted;
+ private Integer deleted;
/** 鍒涘缓鑰� */
@@ -89,6 +89,7 @@
private Short frequency;
/** 鑰冩牳鎻忚堪 */
private String description;
+
/** 鑰冩牳瑙勫垯 */
private List<Map<String,Object>> ruleFormList;
}
--
Gitblit v1.8.0