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/mapper/entity/GenerateDetail.java

@@ -37,6 +37,11 @@ public class GenerateDetail {
      */
     private Byte isLike;
 
+    /**
+     * 喜欢的图片添加到library对应的id
+     */
+    private Long libraryId;
+
     /**
      * 创建时间
      */