Merge remote-tracking branch 'origin/main'

# Conflicts:
#	srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java
#	srs-routine/src/main/java/com/srs/routine/service/impl/NotificationManagementServiceImpl.java

srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsStudent.java

@@ -91,6 +91,8 @@ public class SrsStudent extends BaseEntity
     })
     @TableField(exist = false)
     private SrsMajors srsMajors;
+    @TableField(exist = false)
+    private CphStuExtraInfo cphStuExtraInfo;
     /** 所属班级ID */
 
     private Long classId;