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

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

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

@@ -32,4 +32,11 @@ public class DesignItemClothesDetailVO {
 
     @ApiModelProperty("对应图层信息")
     private List<DesignPythonOutfitVO> layersObject;
+
+    public DesignItemClothesDetailVO() {
+    }
+
+    public DesignItemClothesDetailVO(String type) {
+        this.type = type;
+    }
 }