From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/entity/SysProject.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/SysProject.java b/src/main/java/com/nanometer/smartlab/entity/SysProject.java
index 1de99d3..419633e 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysProject.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysProject.java
@@ -7,6 +7,7 @@
     private String id;
     private String projectId;
     private String projectName;
+    private String project;
     private String sysUserId;
     private String remark;
     private int validFlag;
@@ -85,4 +86,12 @@
     public void setValidFlag(int validFlag) {
         this.validFlag = validFlag;
     }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
 }

--
Gitblit v1.9.2