diff --git a/apps/assets/models.py b/apps/assets/models.py
index 7f4a4c579..4d76b320e 100644
--- a/apps/assets/models.py
+++ b/apps/assets/models.py
@@ -24,7 +24,7 @@ class IDC(models.Model):
     phone = models.CharField(max_length=32, blank=True, verbose_name=_('Phone'))
     address = models.CharField(max_length=128, blank=True, verbose_name=_("Address"))
     network = models.TextField(blank=True, verbose_name=_('Network'))
-    date_added = models.DateField(auto_now=True, null=True, verbose_name=_('Date added'))
+    date_created = models.DateField(auto_now=True, null=True, verbose_name=_('Date added'))
     operator = models.CharField(max_length=32, blank=True, verbose_name=_('Operator'))
     created_by = models.CharField(max_length=32, blank=True, verbose_name=_('Created by'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
@@ -40,7 +40,7 @@ class AssetExtend(models.Model):
     key = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('KEY'))
     value = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('VALUE'))
     created_by = models.CharField(max_length=32, blank=True, verbose_name=_("Created by"))
-    date_added = models.DateTimeField(auto_now=True, null=True, blank=True)
+    date_created = models.DateTimeField(auto_now=True, null=True, blank=True)
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
 
     def __unicode__(self):
@@ -57,7 +57,7 @@ class AdminUser(models.Model):
     private_key = models.CharField(max_length=4096, null=True, blank=True, verbose_name=_('SSH private key'))
     is_default = models.BooleanField(default=True, verbose_name=_('As default'))
     auto_update = models.BooleanField(default=True, verbose_name=_('Auto update pass/key'))
-    date_added = models.DateTimeField(auto_now=True, null=True, blank=True)
+    date_created = models.DateTimeField(auto_now=True, null=True, blank=True)
     create_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
 
@@ -86,7 +86,7 @@ class SysUser(models.Model):
     shell = models.CharField(max_length=64,  blank=True, verbose_name=_('Shell'))
     home = models.CharField(max_length=64, blank=True, verbose_name=_('Home'))
     uid = models.IntegerField(blank=True, verbose_name=_('Uid'))
-    date_added = models.DateTimeField(auto_now=True, null=True)
+    date_created = models.DateTimeField(auto_now=True, null=True)
     create_by = models.CharField(max_length=32, blank=True, verbose_name=_('Created by'))
     comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
 
@@ -124,7 +124,7 @@ class Asset(models.Model):
     sn = models.CharField(max_length=128, null=True, blank=True, unique=True, verbose_name=_('Serial number'))
     created_by = models.CharField(max_length=32, null=True, blank=True, verbose_name=_('Created by'))
     is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
-    date_added = models.DateTimeField(auto_now=True, null=True, blank=True, verbose_name=_('Date added'))
+    date_created = models.DateTimeField(auto_now=True, null=True, blank=True, verbose_name=_('Date added'))
     comment = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Comment'))
 
     def __unicode__(self):
@@ -143,7 +143,7 @@ class Label(models.Model):
     value = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('VALUE'))
     asset = models.ForeignKey(Asset, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_('Asset'))
     created_by = models.CharField(max_length=32, blank=True, verbose_name=_("Created by"))
-    date_added = models.DateTimeField(auto_now=True, null=True)
+    date_created = models.DateTimeField(auto_now=True, null=True)
     comment = models.CharField(max_length=128, blank=True, verbose_name=_('Comment'))
 
     def __unicode__(self):
diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html
index 5d8a48db9..51be7b1db 100644
--- a/apps/assets/templates/assets/asset_detail.html
+++ b/apps/assets/templates/assets/asset_detail.html
@@ -151,7 +151,7 @@
                                     </tr>
                                     <tr>
                                         <td class="text-navy">添加日期</td>
-                                        <td>{{ asset.date_added|date:"Y-m-d H:i:s" }}</td>
+                                        <td>{{ asset.date_created|date:"Y-m-d H:i:s" }}</td>
                                     </tr>
                                     <tr>
                                         <td class="text-navy">备注</td>
diff --git a/apps/users/models.py b/apps/users/models.py
index a1ee15f08..bbf89239f 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -24,7 +24,7 @@ from django.core import signing
 #         verbose_name='permissions',
 #         blank=True,
 #     )
-#     date_added = models.DateTimeField(auto_now_add=True)
+#     date_created = models.DateTimeField(auto_now_add=True)
 #     created_by = models.CharField(max_length=100)
 #     comment = models.CharField(max_length=80, blank=True)
 #
@@ -59,7 +59,7 @@ from django.core import signing
 class UserGroup(models.Model):
     name = models.CharField(max_length=100, unique=True, verbose_name=_('Name'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
-    date_added = models.DateTimeField(auto_now_add=True)
+    date_created = models.DateTimeField(auto_now_add=True)
     created_by = models.CharField(max_length=100)
 
     def __unicode__(self):
diff --git a/apps/users/views.py b/apps/users/views.py
index dbeced754..520b47d89 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -169,7 +169,7 @@ class UserGroupListView(AdminUserRequiredMixin, ListView):
     paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
     context_object_name = 'user_group_list'
     template_name = 'users/user_group_list.html'
-    ordering = '-date_added'
+    ordering = '-date_created'
 
     def get_queryset(self):
         self.queryset = super(UserGroupListView, self).get_queryset()
diff --git a/docs/table_design.xml b/docs/table_design.xml
index 5fb4b4b4b..de825486b 100644
--- a/docs/table_design.xml
+++ b/docs/table_design.xml
@@ -71,16 +71,12 @@
 <row name="is_active" null="0" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>0</default></row>
-<row name="enable_2FA" null="1" autoincrement="0">
+<row name="enable_otp" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>0</default></row>
-<row name="secret_key_2FA" null="1" autoincrement="0">
-<datatype>CHAR</datatype>
-<default>NULL</default></row>
 <row name="role" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="role" row="id" />
-</row>
+<default>NULL</default></row>
 <row name="created_by" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
@@ -106,7 +102,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="227" y="430" name="role">
+<table x="205" y="363" name="role">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -120,7 +116,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="399" y="102" name="usergroup">
+<table x="399" y="102" name="user_group">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -130,7 +126,7 @@
 <row name="comment" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <row name="created_by" null="1" autoincrement="0">
@@ -140,13 +136,13 @@
 <part>id</part>
 </key>
 </table>
-<table x="159" y="181" name="user_usergroup">
+<table x="165" y="151" name="user_user_group">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
 <row name="usergroup_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="usergroup" row="id" />
+<default>NULL</default><relation table="user_group" row="id" />
 </row>
 <row name="user_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -156,7 +152,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="220" y="587" name="permission">
+<table x="201" y="486" name="permission">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -188,7 +184,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="26" y="426" name="role_permission">
+<table x="3" y="364" name="role_permission">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -231,7 +227,7 @@
 <default>NULL</default></row>
 <row name="admin_user" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="adminuser" row="id" />
+<default>NULL</default><relation table="admin_user" row="id" />
 </row>
 <row name="idc" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -242,7 +238,7 @@
 <default>NULL</default></row>
 <row name="type" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="assetextend" row="id" />
+<default>NULL</default><relation table="asset_extend" row="id" />
 </row>
 <row name="brand" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
@@ -264,7 +260,7 @@
 <default>NULL</default></row>
 <row name="env" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="assetextend" row="id" />
+<default>NULL</default><relation table="asset_extend" row="id" />
 </row>
 <row name="cpu" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
@@ -284,14 +280,14 @@
 <row name="created_by" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1278" y="684" name="assetextend">
+<table x="1301" y="687" name="asset_extend">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -305,7 +301,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1274" y="387" name="idc">
+<table x="1294" y="379" name="idc">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -336,14 +332,14 @@
 <row name="created_by" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1269" y="220" name="assetlabel">
+<table x="1269" y="220" name="asset_label">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -361,7 +357,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1080" y="102" name="assetgroup">
+<table x="1080" y="102" name="asset_group">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -374,20 +370,20 @@
 <row name="created_by" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1261" y="101" name="asset_assetgroup">
+<table x="1261" y="101" name="asset_asset_group">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="assetgroup_id" null="1" autoincrement="0">
+<row name="asset_group_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="assetgroup" row="id" />
+<default>NULL</default><relation table="asset_group" row="id" />
 </row>
 <row name="asset_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -397,7 +393,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1272" y="806" name="adminuser">
+<table x="1289" y="806" name="admin_user">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -419,7 +415,7 @@
 <row name="auto_update" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <row name="create_by" null="1" autoincrement="0">
@@ -432,7 +428,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="732" y="571" name="sysuser">
+<table x="720" y="571" name="system_user">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -481,20 +477,20 @@
 <row name="created_by" null="1" autoincrement="0">
 <datatype>CHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>DATETIME</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="873" y="572" name="asset_sysuser">
+<table x="873" y="572" name="asset_system_user">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="sysuser_id" null="1" autoincrement="0">
+<row name="system_user_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="sysuser" row="id" />
+<default>NULL</default><relation table="system_user" row="id" />
 </row>
 <row name="asset_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -504,7 +500,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="870" y="743" name="taskhistory">
+<table x="878" y="743" name="task_history">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -534,7 +530,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1081" y="917" name="task">
+<table x="1079" y="918" name="task">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -567,20 +563,20 @@
 <row name="created_by" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
-<row name="date_added" null="1" autoincrement="0">
+<row name="date_created" null="1" autoincrement="0">
 <datatype>TIME</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="560" y="184" name="usergroup_perm">
+<table x="560" y="184" name="user_group_perm">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="usergroup_id" null="1" autoincrement="0">
+<row name="user_group_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="usergroup" row="id" />
+<default>NULL</default><relation table="user_group" row="id" />
 </row>
 <row name="perm_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -590,7 +586,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="566" y="407" name="user_perm">
+<table x="560" y="361" name="user_perm">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -606,13 +602,13 @@
 <part>id</part>
 </key>
 </table>
-<table x="868" y="184" name="assetgroup_perm">
+<table x="868" y="184" name="asset_group_perm">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="assetgroup_id" null="1" autoincrement="0">
+<row name="asset_group_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="assetgroup" row="id" />
+<default>NULL</default><relation table="asset_group" row="id" />
 </row>
 <row name="perm_id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
@@ -638,11 +634,11 @@
 <part>id</part>
 </key>
 </table>
-<table x="300" y="770" name="loginlog">
+<table x="300" y="770" name="login_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="user_name" null="1" autoincrement="0">
+<row name="username" null="1" autoincrement="0">
 <datatype>VARCHAR</datatype>
 <default>NULL</default></row>
 <row name="login_type" null="1" autoincrement="0">
@@ -667,7 +663,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="139" y="772" name="adminlog">
+<table x="139" y="772" name="admin_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -693,7 +689,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="460" y="769" name="proxylog">
+<table x="435" y="806" name="proxy_log">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -734,13 +730,13 @@
 <part>id</part>
 </key>
 </table>
-<table x="575" y="575" name="commandlog">
+<table x="567" y="575" name="commandlog">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
 <row name="proxy_log" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="proxylog" row="id" />
+<default>NULL</default><relation table="proxy_log" row="id" />
 </row>
 <row name="date_start" null="1" autoincrement="0">
 <datatype>DATE</datatype>
@@ -752,7 +748,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="600" y="754" name="notice">
+<table x="585" y="786" name="notice">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>