From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
index 7282c21..65ee250 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
@@ -1,5 +1,6 @@
package com.ycl.domain.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProcessCoding;
import java.util.List;
@@ -38,16 +39,23 @@
/** 鍙橀粍鐮佺殑澶╂暟 */
@ApiModelProperty("鍙橀粍鐮佺殑澶╂暟")
- private Integer yellowTime;
+ private String yellowTime;
/** 鍙樼孩鐮佺殑澶╂暟 */
@ApiModelProperty("鍙樼孩鐮佺殑澶╂暟")
- private Integer redTime;
+ private String redTime;
+
+ @TableField("overtime")
+ /** 澶勭悊鏈熼檺 */
+ private String overtime;
/** 浠诲姟鐘舵��0杩涜涓�1缁撴潫 */
@ApiModelProperty("浠诲姟鐘舵�乬reen/red/yellow")
private String status;
+ /** 浠诲姟瓒呮椂鐘舵�� */
+ @ApiModelProperty("浠诲姟瓒呮椂鐘舵��")
+ private String overtimeStatus;
public static ProcessCodingVO getVoByEntity(@NonNull ProcessCoding entity, ProcessCodingVO vo) {
if(vo == null) {
vo = new ProcessCodingVO();
--
Gitblit v1.8.0