Merge branch 'newProperty' of http://116.255.223.226:3000/zhangzl/nsgk_web into newProperty

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

view/login/registerFrom.html

@@ -184,13 +184,13 @@
                     </td>
                 </tr>
                 <tr>
-                    <td><span>*</span>身份证（正）:</td>
+                    <td><span>*</span>身份证(正):</td>
                     <td colspan="3">
                         <div id="cupload-3" class="m-l-10 m-b-5 wid30"></div>
                     </td>
                 </tr>
                 <tr>
-                    <td><span>*</span>银行卡:</td>
+                    <td><span>*</span>银行卡(正):</td>
                     <td colspan="3">
                         <div id="cupload-4" class="m-l-10 m-b-5 wid30"></div>
                     </td>