Merge remote-tracking branch 'origin/develop' into develop

app/admin/view/teaching_knowledge/form.html

@@ -42,7 +42,7 @@
         <div class="layui-form-item label-required-prev">
             <tr>
                 <td  width="10%" class="infoBoxTd"><div style="width:55px;">话题<br />(<a href="#" id="AddMoreFileBox" style="color: red" class="btn btn-info">添加</a>):</div></td>
-                <td colspan="2" id="InputsWrapper">
+                <td id="InputsWrapper">
 
                 </td>
             </tr>
@@ -77,7 +77,7 @@
 
         $(AddButton).click(function (e)
         {
-            console.log(x)
+            console.log(InputsWrapper)
             if(x <= MaxInputs)
             {
                 FieldCount++;