解决LoversSetMenstrualPeriodSettingService合并冲突

src/main/java/com/sqx/modules/lovers/service/LoversSetMenstrualPeriodSettingService.java

@@ -1,13 +1,6 @@
 package com.sqx.modules.lovers.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-<<<<<<< HEAD
-import com.sqx.common.utils.Result;
-import com.sqx.modules.lovers.entity.LoversSetMenstrualPeriodSetting;
-
-public interface LoversSetMenstrualPeriodSettingService extends IService<LoversSetMenstrualPeriodSetting> {
-
-=======
 import com.sqx.modules.lovers.dto.LoversSetMenstrualPeriodSettingDTO;
 import com.sqx.modules.lovers.entity.LoversSetMenstrualPeriodSetting;
 
@@ -18,5 +11,4 @@ public interface LoversSetMenstrualPeriodSettingService extends IService<LoversS
      * @param menstrualPeriodSettingDTO 情侣套餐经期信息
      */
     void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO);
->>>>>>> 8850409449b9c25ada6f2ced21d909b90d5559df
 }

src/main/java/com/sqx/modules/lovers/service/impl/LoversSetMenstrualPeriodSettingServiceImpl.java

@@ -2,28 +2,21 @@ package com.sqx.modules.lovers.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.dao.LoversSetMenstrualPeriodSettingDao;
 import com.sqx.modules.lovers.dto.LoversSetMenstrualPeriodSettingDTO;
 import com.sqx.modules.lovers.entity.LoversSetMenstrualPeriodSetting;
 import com.sqx.modules.lovers.service.LoversSetMenstrualPeriodSettingService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
+@RequiredArgsConstructor
 public class LoversSetMenstrualPeriodSettingServiceImpl extends ServiceImpl<LoversSetMenstrualPeriodSettingDao,LoversSetMenstrualPeriodSetting> implements LoversSetMenstrualPeriodSettingService {
 
-<<<<<<< HEAD
-    @Autowired
-    LoversSetMenstrualPeriodSettingDao loversSetMenstrualPeriodSettingDao;
-
-
-=======
     @Override
     public void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO) {
         LoversSetMenstrualPeriodSetting menstrualPeriodSetting = new LoversSetMenstrualPeriodSetting();
         BeanUtil.copyProperties(menstrualPeriodSettingDTO, menstrualPeriodSetting);
         save(menstrualPeriodSetting);
     }
->>>>>>> 8850409449b9c25ada6f2ced21d909b90d5559df
 }