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

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

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

@@ -20,6 +20,7 @@ public class GenerateThroughImageTextDTO {
     @ApiModelProperty("text  image  text-image")
     String generateType;
 
+    /** 暂时没有用上 */
     @ApiModelProperty("图片是update，还是从library中选择")
     String designType;