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

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

@@ -22,6 +22,9 @@ public class CollectionElementUploadDTO {
     @ApiModelProperty("一级类型")
     private String level1Type;
 
+    @ApiModelProperty("性别")
+    private String gender;
+
     @ApiModelProperty("时区")
     private String timeZone;
 

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

@@ -10,4 +10,6 @@ public class ChatRobotVO extends ChatRobot {
 
     private List<ChatRobotLibraryVO> chatRobotLibraryList;
 
+    private Boolean isTutorial = Boolean.FALSE;
+
 }