From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/performance/entity/Performance.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/performance/entity/Performance.java b/src/main/java/org/springblade/modules/performance/entity/Performance.java
index 35893a9..6bf4eeb 100644
--- a/src/main/java/org/springblade/modules/performance/entity/Performance.java
+++ b/src/main/java/org/springblade/modules/performance/entity/Performance.java
@@ -81,6 +81,17 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date time;
 	private String departmentid;
+	/**
+	 * 保安身份证号码
+	 */
+	private String cardid;
+
+	/**
+	 * 服务公司名称
+	 */
+	@TableField("department_name")
+	private String departmentName;
+	private String jurisdiction;
 
 
 }

--
Gitblit v1.9.3