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
This commit is contained in:
MDSMO
2025-08-12 17:19:32 +08:00
11 changed files with 1009 additions and 5 deletions

View File

@@ -1,6 +1,7 @@
package com.srs.routine.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -15,7 +16,7 @@ import com.srs.routine.service.IRtClassMeetingClassService;
* @date 2025-04-08
*/
@Service
public class RtClassMeetingClassServiceImpl extends ServiceImpl<RtClassMeetingClassMapper,RtClassMeetingClass> implements IRtClassMeetingClassService {
public class RtClassMeetingClassServiceImpl extends ServiceImpl<RtClassMeetingClassMapper, RtClassMeetingClass> implements IRtClassMeetingClassService {
@Autowired
private RtClassMeetingClassMapper rtClassMeetingClassMapper;
@@ -49,7 +50,7 @@ public class RtClassMeetingClassServiceImpl extends ServiceImpl<RtClassMeetingCl
*/
@Override
public int insertRtClassMeetingClass(RtClassMeetingClass rtClassMeetingClass) {
return rtClassMeetingClassMapper.insertRtClassMeetingClass(rtClassMeetingClass);
return rtClassMeetingClassMapper.insertRtClassMeetingClass(rtClassMeetingClass);
}
/**