。。

src/main/java/com/chinaitop/depot/risk/service/impl/ViolationWarningAlarmServiceImpl.java

@@ -8,11 +8,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.RequiredArgsConstructor;
 
-<<<<<<< HEAD
 import org.springframework.context.annotation.Bean;
-=======
 import org.apache.commons.lang.StringUtils;
->>>>>>> dev
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -55,11 +52,9 @@ public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmSe
 
     @Override
     public void updateDate(ViolationWarningAlarm violationWarningAlarm) {
-<<<<<<< HEAD
         violationWarningAlarmMapper.updateById(violationWarningAlarm);
         this.gjjjk(violationWarningAlarm.getId(), violationWarningAlarm.getOrgId(), "u");
         
-=======
     	if(StringUtils.isNotBlank(violationWarningAlarm.getDisposer())
                 && StringUtils.isNotBlank(violationWarningAlarm.getDisposeContent())
                 && StringUtils.isNotBlank(violationWarningAlarm.getDisposeTime())){
@@ -67,7 +62,6 @@ public class ViolationWarningAlarmServiceImpl implements ViolationWarningAlarmSe
                   violationWarningAlarm.setCurrentStatus(1);//设置处置状态为已处置
                   violationWarningAlarmMapper.updateById(violationWarningAlarm);
         }
->>>>>>> dev
     }