Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

# Conflicts:
#	eforclient.html

edit.html

@@ -1103,10 +1103,10 @@
                                     </div>
                                     <ul>
                                     <li name="intro">
-                                        <div class="itemTitle secondFontSize" data-size="2000">
+                                        <div class="itemTitle secondFontSize" data-size="4000">
                                             <span>简介</span>
                                         </div>
-                                        <textarea placeholder="简介" class="editText" maxlength="2000"></textarea>
+                                        <textarea placeholder="简介" class="editText" maxlength="4000"></textarea>
                                         <div class="buttons" name='addSign' style='margin-top:-13px'>
                                             <button class="innerBtn cancel" name='space'>加空格</button>
                                             <button class="innerBtn cancel" name='return'>加换行</button>

eforclient.html

@@ -1103,10 +1103,10 @@
                                     </div>
                                     <ul>
                                     <li name="intro">
-                                        <div class="itemTitle secondFontSize" data-size="2000">
+                                        <div class="itemTitle secondFontSize" data-size="4000">
                                             <span>简介</span>
                                         </div>
-                                        <textarea placeholder="简介" class="editText" maxlength="2000"></textarea>
+                                        <textarea placeholder="简介" class="editText" maxlength="4000"></textarea>
                                         <div class="buttons" name='addSign' style='margin-top:-13px'>
                                             <button class="innerBtn cancel" name='space'>加空格</button>
                                             <button class="innerBtn cancel" name='return'>加换行</button>
@@ -1871,6 +1871,7 @@
      
     
         window.isEdit = true
+      
 
     </script>