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

# Conflicts:
#	src/main/resources/messages_en.properties

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

@@ -13,4 +13,7 @@ public class GenerateCollectionItemVO {
 
     @ApiModelProperty("generate生成图片的url")
     private String generateItemUrl;
+
+    @ApiModelProperty("生成的图片是否已经被like")
+    private Boolean isLiked = Boolean.FALSE;
 }