Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

app/Http/Controllers/AjaxController.php

@@ -166,7 +166,7 @@ Class AjaxController extends Controller
      */
     public function add_template($request){
         $template_name = $request->input("designName",'');
-        $html = $request->input("html",'');
+        $html = $request->input("htmlp",'');
         $lableBg = $request->input("lableBg",'');
         $lableBorder = $request->input("lableBorder",'');
         $lableSize = $request->input("lableSize",'');
@@ -223,7 +223,13 @@ Class AjaxController extends Controller
         }
 
 
+    }
+
 
+    /**
+     * 编辑模板 获取模板详情
+     */
+    public function getTemplateDetail(){
 
     }