diff --git a/doc/9-10周作业.docx b/doc/9-10周作业.docx
new file mode 100644
index 0000000..1adc700
Binary files /dev/null and b/doc/9-10周作业.docx differ
diff --git a/doc/9-10周作业作业.docx b/doc/9-10周作业作业.docx
new file mode 100644
index 0000000..b130021
Binary files /dev/null and b/doc/9-10周作业作业.docx differ
diff --git a/doc/DjangoBlog.zip b/doc/DjangoBlog.zip
new file mode 100644
index 0000000..da01807
Binary files /dev/null and b/doc/DjangoBlog.zip differ
diff --git a/src/DjangoBlog（1）.zip b/src/DjangoBlog（1）.zip
new file mode 100644
index 0000000..34ac95b
Binary files /dev/null and b/src/DjangoBlog（1）.zip differ
diff --git a/src/django-master/comments/models.py b/src/django-master/comments/models.py
index f8fcd2e..a3bb081 100644
--- a/src/django-master/comments/models.py
+++ b/src/django-master/comments/models.py
@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _  # 国际化翻译，支
 
 # 导入关联模型：从blog应用导入Article模型（评论需关联到具体文章）
 from blog.models import Article
-
+from django.utils import timezone
 
 # Create your models here.
 class Comment(models.Model):
@@ -16,12 +16,17 @@ class Comment(models.Model):
     """
     # 1. 评论正文：长文本字段，限制最大300字符
     body = models.TextField('正文', max_length=300)
+<<<<<<< HEAD
     
     # 2. 时间字段：创建时间和最后修改时间，默认值为当前时间
     creation_time = models.DateTimeField(_('creation time'), default=now)  # 评论创建时间
     last_modify_time = models.DateTimeField(_('last modify time'), default=now)  # 评论最后修改时间
     
     # 3. 关联用户：多对一（多个评论属于一个用户）
+=======
+    creation_time = models.DateTimeField(_('creation time'), default=now)
+   last_modify_time = models.DateTimeField(_('last modify time'), default=timezone.now)
+>>>>>>> ZYY_branch
     author = models.ForeignKey(
         settings.AUTH_USER_MODEL,  # 关联项目配置的用户模型（而非固定User，更灵活）
         verbose_name=_('author'),  # 字段在Admin后台显示的名称（支持国际化）
@@ -61,4 +66,14 @@ class Comment(models.Model):
 
     # 模型实例的字符串表示：打印评论对象时显示正文（便于调试和Admin显示）
     def __str__(self):
-        return self.body
\ No newline at end of file
+<<<<<<< HEAD
+        return self.body
+=======
+        return self.body
+
+    def save(self, *args, **kwargs):
+        if not self.id:  # 如果是新对象，creation_time 将由 default=timezone.now 处理
+            self.creation_time = timezone.now()
+        self.last_modify_time = timezone.now()
+        super(Comment, self).save(*args, **kwargs)    
+>>>>>>> ZYY_branch