From 393df8c2013b34fdd60bff312815d6a05d3e0ecc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 四月 2024 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 16 +++++++++++++++-
1 files changed, 15 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..0373017 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
@@ -1,9 +1,15 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckTemplate;
+
+import java.math.BigDecimal;
+import java.util.Date;
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 +31,7 @@
private String templateName;
/** 璋冩暣绯绘暟 */
- private Integer adjustCoefficient;
+ private BigDecimal adjustCoefficient;
/** 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 */
private String adjustWay;
@@ -33,6 +39,14 @@
/** 鐘舵�� */
private String status;
+ /** 瑙勫垯鍒楄〃 */
+ private List<RuleItemVO> ruleFormList;
+ /** 鍗曚綅鍚� */
+ private String unitName;
+ private Integer unitId;
+ /** 鑰冩牳绫诲瀷 */
+ private String examineCategory;
+
public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
if(vo == null) {
vo = new CheckTemplateVO();
--
Gitblit v1.8.0