From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java
index 438174a..5ffeb5a 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java
@@ -27,6 +27,8 @@
private String orderType;
+ private Integer isDelete;
+
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date createStartTime;
--
Gitblit v1.8.0