From d509e0106519f52c0997b621abfc86aaf72c2ad2 Mon Sep 17 00:00:00 2001
From: djq <1092424998@qq.com>
Date: Sat, 25 Oct 2025 23:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DjangoBlog-master/comments/models.py      | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py
index 30a2bcf..c163d02 100644
--- a/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py
+++ b/src/DjangoBlog-master(1)/DjangoBlog-master/comments/models.py
@@ -6,45 +6,38 @@ from django.utils.translation import gettext_lazy as _
 from blog.models import Article
 
 
-# 定义评论模型，用于存储文章的评论信息
+# Create your models here.
+
 class Comment(models.Model):
-    # 评论正文，最大长度300字
     body = models.TextField('正文', max_length=300)
-    # 评论创建时间，默认使用当前时间
     creation_time = models.DateTimeField(_('creation time'), default=now)
-    # 评论最后修改时间，默认使用当前时间
     last_modify_time = models.DateTimeField(_('last modify time'), default=now)
-    # 评论作者，关联到Django内置的用户模型，用户删除时评论也删除
     author = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         verbose_name=_('author'),
         on_delete=models.CASCADE)
-    # 评论所属文章，关联到Article模型，文章删除时评论也删除
     article = models.ForeignKey(
         Article,
         verbose_name=_('article'),
         on_delete=models.CASCADE)
-    # 父评论，自关联，允许为空，父评论删除时子评论也删除
     parent_comment = models.ForeignKey(
         'self',
         verbose_name=_('parent comment'),
         blank=True,
         null=True,
         on_delete=models.CASCADE)
-    # 评论是否启用，布尔类型，默认不启用
     is_enable = models.BooleanField(_('enable'),
                                     default=False, blank=False, null=False)
 
     class Meta:
-        # 按ID倒序排列
         ordering = ['-id']
-        # 模型单数名称
         verbose_name = _('comment')
-        # 模型复数名称
         verbose_name_plural = verbose_name
-        # 按ID获取最新记录
         get_latest_by = 'id'
 
-    # 打印评论时显示正文内容
     def __str__(self):
-        return self.body
\ No newline at end of file
+<<<<<<< HEAD
+        return self.body
+=======
+        return self.body
+>>>>>>> ccy_branch