From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
index 97926b4..dd0874c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
+++ b/src/main/java/org/springblade/modules/dispatcher/vo/DispatcherVO.java
@@ -16,10 +16,10 @@
*/
package org.springblade.modules.dispatcher.vo;
-import org.springblade.modules.dispatcher.entity.Dispatcher;
+import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
/**
* 视图实体类
@@ -33,4 +33,14 @@
public class DispatcherVO extends Dispatcher {
private static final long serialVersionUID = 1L;
+ /**
+ * 派遣单位名称
+ */
+ private String dispatcherCompany;
+
+ /**
+ * 保安单位名称
+ */
+ private String deptName;
+
}
--
Gitblit v1.9.3