Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

web/select.jsp

@@ -25,7 +25,7 @@
             <div class="select-blank"></div>
             <div class="selected-bottom"></div>
         </div>
-        <div class="list-frame bar-hange">c
+        <div class="list-frame bar-hange">
             <div class="list-child">
                 <div class="name"><span class="the-name">李先生</span></div>
                 <div class="other-msgs">