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

app/admin/view/teaching_knowledge/form.html

@@ -30,6 +30,11 @@
             </table>
         </div>
 
+        <label class="layui-form-item relative block">
+            <input type="text" name="myfile">
+            <a data-file data-type="png,jpg,jpeg" data-field="myfile">上传文件</a>
+        </label>
+
 
 
         <div class="layui-form-item label-required-prev">