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

public/js/web/design.js

@@ -359,7 +359,6 @@ var tag={
            $(".edit-con .huabuitem").removeClass("act");
            $(".edit-con").removeClass("init-border");
            obj.htmlp=String($(".edit-box").html());
-           console.log(obj.htmlp)
            obj.designName=$(".designName").val()
            $.ajax({
             url : '/ajax/add_template',