Merge remote-tracking branch 'origin/dev_ic_mp' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandSatisfactionServiceImpl.java

@@ -17,9 +17,11 @@ import com.epmet.entity.IcUserDemandServiceEntity;
 import com.epmet.service.IcPartyUnitService;
 import com.epmet.service.IcResiDemandDictService;
 import com.epmet.service.IcUserDemandSatisfactionService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -27,7 +29,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-
+@Slf4j
+@Service
 public class IcUserDemandSatisfactionServiceImpl extends BaseServiceImpl<IcUserDemandSatisfactionDao, IcUserDemandSatisfactionEntity> implements IcUserDemandSatisfactionService {
 
     @Autowired