From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +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