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/webapp/user_mng.xhtml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index b133e54..3bd3054 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -15,16 +15,22 @@
         <p:panel styleClass="center-header">
             <p:outputLabel styleClass="title" value="用户管理"></p:outputLabel>
 
-            <p:panelGrid styleClass="filter" columns="7">
+            <p:panelGrid styleClass="filter" columns="11">
                 <p:outputLabel value="ARP号:"></p:outputLabel>
                 <p:inputText value="#{userMngController.arp}"></p:inputText>
 
                 <p:outputLabel value="姓名:"></p:outputLabel>
                 <p:inputText value="#{userMngController.name}"></p:inputText>
 
+                <p:outputLabel value="课题组:"></p:outputLabel>
+                <p:inputText value="#{userMngController.project}"></p:inputText>
+
                 <p:outputLabel value="部门:"></p:outputLabel>
                 <p:inputText value="#{userMngController.departmentName}"></p:inputText>
 
+                <p:outputLabel value="单位:"></p:outputLabel>
+                <p:inputText value="#{userMngController.company}"></p:inputText>
+
                 <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
             </p:panelGrid>
         </p:panel>

--
Gitblit v1.9.2