Merge branch 'dev/dev' into dev/dev_shb

# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java
#	src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
#	src/main/java/com/ai/da/service/AccountService.java
#	src/main/java/com/ai/da/service/LibraryService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
#	src/main/resources/application-prod.properties
#	src/main/resources/application-test.properties

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

@@ -19,6 +19,13 @@ public class GenerateCollectionVO {
     @ApiModelProperty("生成的图片信息")
     private List<GenerateCollectionItemVO> generatedCollectionItems;
 
+    @ApiModelProperty("在当前队列中的排序")
+    private Long rankPosition;
+
+    public GenerateCollectionVO(Long rankPosition) {
+        this.rankPosition = rankPosition;
+    }
+
     public GenerateCollectionVO(Long generateId, Long collectionId, List<GenerateCollectionItemVO> generatedCollectionItems) {
         this.generateId = generateId;
         this.collectionId = collectionId;

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

@@ -18,6 +18,6 @@ public class PageQueryBaseVo {
 
     @ApiModelProperty("每页数量")
     @Min(value = 0, message = "The minimum size is 1")
-    @Max(value = 50, message = "The maximum size is 50")
+//    @Max(value = 50, message = "The maximum size is 50")
     private Integer size = 20;
 }