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/query/CheckTemplateQuery.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 557758b..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
@@ -27,7 +27,7 @@
     private String templateName;
 
     /** 璋冩暣绯绘暟 */
-    private Long adjustCoefficient;
+    private String adjustCoefficient;
 
     /** 璋冩暣鏂瑰紡锛氫箻闄� */
     private String adjustWay;
@@ -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