Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java

src/main/java/com/ai/da/model/vo/CollectionColorVO.java

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
+@EqualsAndHashCode
 @ApiModel("设计Collection颜色板 响应")
 public class CollectionColorVO {
 

src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode
 @ApiModel("用户关联的collection-响应")
 public class UserLikeCollectionVO {