Merge remote-tracking branch 'origin/master'

jinja2-demo/test.py

@@ -13,35 +13,28 @@ def write_file(j2_file, to_file, param):
 # write_file("test.j2", './test.conf', {"name": 'xiaoxiao1', "age": '18', "country": 'China'})
 
 vue_obj = {
-    "table_name": "table2",
+    "table_name": "web_history",
     "table_objs": [
         {
-            "prop": "name",
-            "label": "姓名",
-            "width": "150",
-            "search": True,
-            "edit": True
+            "prop": "id",
+            "label": "id",
+            "width": "100",
+            "search": False,
+            "edit": False
         },
         {
-            "prop": "age",
-            "label": "年龄",
+            "prop": "title",
+            "label": "标题",
             "width": "150",
             "search": True,
             "edit": True
         },
         {
-            "prop": "date",
-            "label": "日期",
-            "width": "150",
-            "search": True,
-            "edit": False
-        },
-        {
-            "prop": "email",
-            "label": "email地址",
+            "prop": "url",
+            "label": "URL 地址",
             "width": "300",
             "search": False,
-            "edit": True
+            "edit": False
         }
     ]
 }