From 943c5905b7f4ff48c7ae87c41b41aeae854f8a20 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:02:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index 5dfca31..ddf8f60 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.allocation;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
@@ -135,6 +136,9 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @TableField(exist = false)
+ private String time;
+
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
--
Gitblit v1.8.0