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

# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

src/main/java/com/ai/da/model/enums/Position.java

@@ -10,7 +10,12 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum Position implements IEnumDisplay {
 
     OVERALL("Overall"),
-    SINGLE("Single")
+    OUTWEAR("Outwear"),
+    BLOUSE("Blouse"),
+    DRESS("Dress"),
+    TROUSERS("Trousers"),
+    SKIRT("Skirt")
+//    SINGLE("Single"),
     ;
 
     private String value;

src/main/java/com/ai/da/model/enums/Sex.java

@@ -9,8 +9,10 @@ import com.fasterxml.jackson.annotation.JsonValue;
  */
 public enum Sex implements IEnumDisplay {
 
-    MALE("Male"),
     FEMALE("Female"),
+
+    MALE("Male"),
+
     CHILD("Child")
     ;
 

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

@@ -18,4 +18,7 @@ public class UserLikeVO {
     private Long designItemId;
     @ApiModelProperty("图片路径")
     private String url;
+    @ApiModelProperty("图片路径")
+    private String designOutfitUrl;
+
 }