更新

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

@@ -11,8 +11,5 @@ public interface LoversSetMenstrualPeriodSettingService extends IService<LoversS
      * @param menstrualPeriodSettingDTO 情侣套餐经期信息
      */
     void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO);
-<<<<<<< HEAD
 
-=======
->>>>>>> 339a517061cfc95de26bf1ba8231893b21076a95
 }

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

@@ -7,28 +7,23 @@ import com.sqx.modules.lovers.dto.LoversSetMenstrualPeriodSettingDTO;
 import com.sqx.modules.lovers.entity.LoversSetMenstrualPeriodSetting;
 import com.sqx.modules.lovers.service.LoversSetMenstrualPeriodSettingService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class LoversSetMenstrualPeriodSettingServiceImpl extends ServiceImpl<LoversSetMenstrualPeriodSettingDao,LoversSetMenstrualPeriodSetting> implements LoversSetMenstrualPeriodSettingService {
 
-<<<<<<< HEAD
+
 
     @Autowired
     LoversSetMenstrualPeriodSettingDao loversSetMenstrualPeriodSettingDao;
 
-
-=======
->>>>>>> 339a517061cfc95de26bf1ba8231893b21076a95
     @Override
     public void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO) {
         LoversSetMenstrualPeriodSetting menstrualPeriodSetting = new LoversSetMenstrualPeriodSetting();
         BeanUtil.copyProperties(menstrualPeriodSettingDTO, menstrualPeriodSetting);
         save(menstrualPeriodSetting);
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> 339a517061cfc95de26bf1ba8231893b21076a95
 }