From 96c8d28c6460c6e208b47e8fd0b70f7f3beace25 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Thu, 6 Aug 2015 13:17:15 +0800
Subject: [PATCH] =?UTF-8?q?announcement=20model.py=20=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=88=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/migrations/0004_auto_20150806_1251.py | 23 +++++++++++++++++++
 announcement/migrations/0001_initial.py       |  3 ++-
 .../migrations/0002_auto_20150806_1104.py     | 19 ---------------
 announcement/models.py                        |  2 ++
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 account/migrations/0004_auto_20150806_1251.py
 delete mode 100644 announcement/migrations/0002_auto_20150806_1104.py

diff --git a/account/migrations/0004_auto_20150806_1251.py b/account/migrations/0004_auto_20150806_1251.py
new file mode 100644
index 0000000..d3d2225
--- /dev/null
+++ b/account/migrations/0004_auto_20150806_1251.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0003_user_email'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='admin_group',
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='admin_type',
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/announcement/migrations/0001_initial.py b/announcement/migrations/0001_initial.py
index 24a1d13..7e8d583 100644
--- a/announcement/migrations/0001_initial.py
+++ b/announcement/migrations/0001_initial.py
@@ -17,8 +17,9 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('title', models.CharField(max_length=50)),
-                ('description', models.TextField()),
+                ('content', models.TextField()),
                 ('create_time', models.DateTimeField(auto_now_add=True)),
+                ('last_update_time', models.DateTimeField(auto_now=True)),
                 ('visible', models.BooleanField(default=True)),
                 ('created_by', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
diff --git a/announcement/migrations/0002_auto_20150806_1104.py b/announcement/migrations/0002_auto_20150806_1104.py
deleted file mode 100644
index 2768cc6..0000000
--- a/announcement/migrations/0002_auto_20150806_1104.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('announcement', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='announcement',
-            old_name='description',
-            new_name='content',
-        ),
-    ]
diff --git a/announcement/models.py b/announcement/models.py
index a3574b8..491c219 100644
--- a/announcement/models.py
+++ b/announcement/models.py
@@ -13,6 +13,8 @@ class Announcement(models.Model):
     create_time = models.DateTimeField(auto_now_add=True)
     # 这个公告是谁创建的
     created_by = models.ForeignKey(User)
+    # 最后更新时间
+    last_update_time = models.DateTimeField(auto_now=True)
     # 是否可见 false的话相当于删除
     visible = models.BooleanField(default=True)