diff --git a/learning_center/models/course_homework.py b/learning_center/models/course_homework.py
index ffcb0eb..3b0cd3b 100644
--- a/learning_center/models/course_homework.py
+++ b/learning_center/models/course_homework.py
@@ -35,8 +35,12 @@ class CourseHomework(models.Model):
     teaching_class_id = fields.Many2one('course.teaching_class', string='教学班',
                                         ondelete='cascade', domain="[('course_id', '=', course_id)]")
     submit_ids = fields.One2many('course.homework.submit', 'homework_id', string='提交记录')
+<<<<<<< HEAD
 <<<<<<< HEAD
     score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项目')
+=======
+    score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项')
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
 =======
     score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项')
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
@@ -86,6 +90,7 @@ class CourseHomework(models.Model):
         self.publish_time = fields.Datetime.now()
         # 1. 批量为本班学生生成空白未提交记录
         self._auto_create_empty_submit()
+<<<<<<< HEAD
 <<<<<<< HEAD
         # 新增：自动生成对应作业的学生成绩明细
         self._auto_create_homework_score_detail()
@@ -146,6 +151,11 @@ class CourseHomework(models.Model):
         # 2. 推送作业通知给学生
         self._send_homework_notice_to_students()
 
+=======
+        # 2. 推送作业通知给学生
+        self._send_homework_notice_to_students()
+
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
     def _send_homework_notice_to_students(self):
         """发布作业后推送消息给教学班学生"""
         self.ensure_one()
@@ -174,6 +184,9 @@ class CourseHomework(models.Model):
             partner_ids=student_users.mapped('partner_id').ids,
             subtype_xmlid='mail.mt_comment'
         )
+<<<<<<< HEAD
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
+=======
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
 
     def _auto_create_empty_submit(self):
@@ -202,15 +215,19 @@ class CourseHomework(models.Model):
             batch_vals.append({
                 'homework_id': self.id,
                 'student_id': stu_id,
+<<<<<<< HEAD
 <<<<<<< HEAD
                 'course_score_item_id':self.course_score_item_id.id,
 =======
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
+=======
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
                 'state': 'unsubmit'  # 默认未提交
             })
         # 批量创建空白提交记录
         submit_model.create(batch_vals)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     def _send_homework_notice_to_students(self):
         """发布作业后推送消息给教学班学生"""
@@ -241,6 +258,8 @@ class CourseHomework(models.Model):
             subtype_xmlid='mail.mt_note'
         )
 
+=======
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
 =======
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
     # ====================== 草稿/关闭作业 ======================
@@ -369,6 +388,7 @@ class CourseHomework(models.Model):
     def create(self, vals):
         homework_record = super().create(vals)
         # 草稿状态不执行自动生成提交记录，移到action_publish
+<<<<<<< HEAD
 <<<<<<< HEAD
 
         target_a = self.env["course.score.item"].search([
@@ -382,5 +402,7 @@ class CourseHomework(models.Model):
                 "homework_ids": [(4, homework_record.id)]
             })
 =======
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
+=======
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
         return homework_record
\ No newline at end of file
diff --git a/learning_center/models/course_homework_submit.py b/learning_center/models/course_homework_submit.py
index 589f2d6..9cdc495 100644
--- a/learning_center/models/course_homework_submit.py
+++ b/learning_center/models/course_homework_submit.py
@@ -94,7 +94,10 @@ class CourseHomeworkSubmit(models.Model):
         submit_rec = super().create(vals)
         self._check_submit_change_state(submit_rec)
 <<<<<<< HEAD
+<<<<<<< HEAD
 
+=======
+>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
 =======
 >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
         return submit_rec