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

# Conflicts: # docker-compose.yml
2023-12-13 17:26:48 +08:00
parent a14188ee35 b71a1c834d
commit 79cff13edb
6 changed files with 27 additions and 8 deletions
--- a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java
@@ -20,4 +20,6 @@ public class UserLikeChooseVO {

    @ApiModelProperty("关联的collection")
    private UserLikeCollectionVO collection;
+
+    private String sex;
 }