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

src/main/java/com/ai/da/model/dto/AccountAddDTO.java

@@ -27,4 +27,6 @@ public class AccountAddDTO {
     @ApiModelProperty("End time of account validity ")
     private String validEndTime;
 
+    private Integer isTrial;
+
 }

src/main/java/com/ai/da/model/dto/QueryLibraryPageDTO.java

@@ -26,4 +26,7 @@ public class QueryLibraryPageDTO extends PageQueryBaseVo {
 
     @ApiModelProperty("分类ID")
     private List<Long> classificationIdList;
+
+    @ApiModelProperty("交集还是并集：1交集2并集")
+    private Integer intersection;
 }

src/main/java/com/ai/da/model/dto/QueryLibraryPageServiceDTO.java

@@ -28,4 +28,6 @@ public class QueryLibraryPageServiceDTO extends PageQueryBaseVo {
 
     private List<Long> classificationIdList;
 
+    private Integer intersection;
+
 }

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

@@ -26,4 +26,7 @@ public class AccountLoginVO {
     @ApiModelProperty("userId")
     private Long userId;
 
+    @ApiModelProperty("是否是试用用户")
+    private Integer isTrial;
+
 }