From aba05c3bc6cd5ef5c48b268d557fc85a11ad0fae Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 17:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
index 2dfebd2..1e2f7a2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
@@ -2,8 +2,12 @@
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckTemplate;
+
+import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
+
+import com.ycl.platform.domain.form.CheckTemplateForm;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -25,7 +29,7 @@
private String templateName;
/** 璋冩暣绯绘暟 */
- private Integer adjustCoefficient;
+ private BigDecimal adjustCoefficient;
/** 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 */
private String adjustWay;
@@ -33,6 +37,9 @@
/** 鐘舵�� */
private String status;
+ /** 瑙勫垯鍒楄〃 */
+ private List<RuleItemVO> ruleFormList;
+
public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
if(vo == null) {
vo = new CheckTemplateVO();
--
Gitblit v1.8.0