From 63ea601aa950e88237728bf183e30268a3af8616 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 10:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
index 1659ab2..72b708b 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java
@@ -46,7 +46,7 @@
 	/**
 	 * 派遣人数
 	 */
-	private Integer num;
+	private Integer snum;
 
 	/**
 	 * 开始时间
@@ -62,4 +62,9 @@
 	 * 辖区名称
 	 */
 	private String jurisdictionName;
+
+	/**
+	 * 是否到期
+	 */
+	private Integer isExpire;
 }

--
Gitblit v1.9.3