From 37f41a7c17d81a60092e9d69363905f21d9b1a49 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 19 三月 2024 17:34:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 3 +++ 1 files changed, 3 insertions(+), 0 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 a6b65d2..258a480 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,11 @@ 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; @@ -41,6 +43,7 @@ private List<RuleItemVO> ruleFormList; /** 鍗曚綅鍚� */ private String unitName; + public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) { if(vo == null) { vo = new CheckTemplateVO(); -- Gitblit v1.8.0