From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
similarity index 84%
rename from flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
rename to flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
index 9e66afb..af7ee57 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
@@ -1,14 +1,12 @@
package com.ycl.domain.vo;
import com.ycl.system.domain.base.AbsVo;
-import com.ycl.domain.entity.FlowLog;
-import java.util.List;
+import com.ycl.domain.entity.ProcessLog;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
/**
* 娴佺▼鏃ュ織灞曠ず
@@ -18,7 +16,7 @@
*/
@Data
@ApiModel(value = "娴佺▼鏃ュ織鍝嶅簲鏁版嵁", description = "娴佺▼鏃ュ織鍝嶅簲鏁版嵁")
-public class FlowLogVO extends AbsVo {
+public class ProcessLogVO extends AbsVo {
/** 浠诲姟id */
@ApiModelProperty("浠诲姟id")
@@ -44,9 +42,9 @@
@ApiModelProperty("浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭�")
private String eventDataJson;
- public static FlowLogVO getVoByEntity(@NonNull FlowLog entity, FlowLogVO vo) {
+ public static ProcessLogVO getVoByEntity(@NonNull ProcessLog entity, ProcessLogVO vo) {
if(vo == null) {
- vo = new FlowLogVO();
+ vo = new ProcessLogVO();
}
BeanUtils.copyProperties(entity, vo);
return vo;
--
Gitblit v1.8.0