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;
 }