Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java

@@ -39,8 +39,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.DecimalFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author wjt

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/ActivationRecord.java

@@ -2,7 +2,6 @@ package com.baiye.modules.platform.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;

ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClueMiddle.java

@@ -2,7 +2,6 @@ package com.baiye.model.entity;
 
 import com.baiye.util.JpaConverterListJson;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;