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

# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
#	src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/Product.java
#	src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java

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

@@ -47,4 +47,7 @@ public class GenerateThroughImageTextDTO {
 
     @ApiModelProperty("唯一id，用于保持消息唯一性")
     String uniqueId;
+
+    @ApiModelProperty("是否是测试用户")
+    Boolean isTestUser;
 }

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

@@ -0,0 +1,25 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("prepare for generate响应vo")
+public class PrepareForGenerateVO {
+
+    @ApiModelProperty("uniqueId")
+    private String uniqueId;
+
+    @ApiModelProperty("剩余使用次数")
+    private Integer leftUsageCount;
+
+    public PrepareForGenerateVO(String uniqueId, Integer leftUsageCount) {
+        this.uniqueId = uniqueId;
+        this.leftUsageCount = leftUsageCount;
+    }
+
+    public PrepareForGenerateVO(Integer leftUsageCount) {
+        this.leftUsageCount = leftUsageCount;
+    }
+}