人员管理修改区域二级显示 页面修整

.idea/workspace.xml

@@ -8,14 +8,9 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="基本完善">
+    <list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="人员管理修改区域二级显示">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/report_sunac.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac.war" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" />
     </list>
@@ -72,8 +67,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="157">
-              <caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
+            <state relative-caret-position="189">
+              <caret line="145" column="31" lean-forward="true" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -1308,14 +1303,7 @@
       <workItem from="1563930477196" duration="23466000" />
       <workItem from="1564017393575" duration="26783000" />
       <workItem from="1564103732268" duration="2278000" />
-      <workItem from="1564112769708" duration="7978000" />
-    </task>
-    <task id="LOCAL-00071" summary="去掉链接长度限制">
-      <created>1499222787162</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1499222787164</updated>
+      <workItem from="1564112769708" duration="8056000" />
     </task>
     <task id="LOCAL-00072" summary="处理texarea折行问题">
       <created>1499244010123</created>
@@ -1653,11 +1641,18 @@
       <option name="project" value="LOCAL" />
       <updated>1564117353419</updated>
     </task>
-    <option name="localTasksCounter" value="120" />
+    <task id="LOCAL-00120" summary="人员管理修改区域二级显示">
+      <created>1564124432970</created>
+      <option name="number" value="00120" />
+      <option name="presentableId" value="LOCAL-00120" />
+      <option name="project" value="LOCAL" />
+      <updated>1564124432970</updated>
+    </task>
+    <option name="localTasksCounter" value="121" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1206787000" />
+    <option name="totallyTimeSpent" value="1206865000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1809,7 +1804,6 @@
       <path value="$PROJECT_DIR$/../xinao-officeassets-core" />
       <path value="$PROJECT_DIR$/../git/Git/repository" />
     </ignored-roots>
-    <MESSAGE value="注释掉oa用户编辑" />
     <MESSAGE value="屏蔽掉OA用户" />
     <MESSAGE value="屏蔽oa用户的备注" />
     <MESSAGE value="注掉提问的压缩图片" />
@@ -1834,7 +1828,8 @@
     <MESSAGE value="需求更新" />
     <MESSAGE value="测试git" />
     <MESSAGE value="基本完善" />
-    <option name="LAST_COMMIT_MESSAGE" value="基本完善" />
+    <MESSAGE value="人员管理修改区域二级显示" />
+    <option name="LAST_COMMIT_MESSAGE" value="人员管理修改区域二级显示" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -2372,8 +2367,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
+        <state relative-caret-position="189">
+          <caret line="145" column="31" lean-forward="true" selection-start-line="145" selection-start-column="31" selection-end-line="145" selection-end-column="31" />
         </state>
       </provider>
     </entry>