Merge branch 'dev/dev' into dev/dev_xp

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

src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java

@@ -47,6 +47,12 @@ public class Portfolio implements Serializable {
     @ApiModelProperty(value = "是否允许二次创作1允许0不允许")
     private Integer openSource;
 
+    private Integer original;
+
+    private Long originalAccountId;
+
+    private Long originalPortfolioId;
+
     @ApiModelProperty(value = "作品集作者ID")
     private Long accountId;
 

src/main/java/com/ai/da/mapper/primary/entity/UserLikeGroup.java

@@ -43,6 +43,12 @@ public class UserLikeGroup implements Serializable {
      */
     private String name;
 
+    private Integer original;
+
+    private Long originalAccountId;
+
+    private Long originalPortfolioId;
+
     /**
      * 创建时间
      */