Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge

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

src/main/resources/mapper/primary/UserLikeGroupMapper.xml

@@ -38,7 +38,7 @@
 
     <!-- 批量查询模块内容，使用JOIN优化避免N+1查询 -->
     <select id="getModuleContentBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             cs.id as sort_id,
             cs.parent_id,
             cs.relation_id,
@@ -92,7 +92,7 @@
 
     <!-- 批量查询ToProductImageResult及相关数据 -->
     <select id="getToProductImageResultBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             tpir.id,
             tpir.url,
             tpir.element_type,
@@ -119,7 +119,7 @@
 
     <!-- 批量查询UserLike及相关设计数据 -->
     <select id="getUserLikeBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             ul.id,
             ul.design_item_id,
             ul.design_outfit_id,
@@ -139,7 +139,7 @@
 
     <!-- 批量查询ToProductElement数据 -->
     <select id="getToProductElementBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             id,
             url,
             project_id,
@@ -154,7 +154,7 @@
 
     <!-- 批量查询design模块的python outfit数据 -->
     <select id="getDesignPythonOutfitBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             tpo.id as outfit_id,
             tpo.parent_id,
             tpo.url as outfit_url,
@@ -163,7 +163,7 @@
             cs.id as sort_id
         FROM t_design_python_outfit tpo
         LEFT JOIN collection_sort cs ON cs.relation_id = tpo.id AND cs.relation_type = 'DesignPythonOutfit'
-        WHERE tpo.parent_id IN 
+        WHERE tpo.parent_id IN
         <foreach collection="outfitIds" item="outfitId" open="(" close=")" separator=",">
             #{outfitId}
         </foreach>
@@ -172,11 +172,11 @@
 
     <!-- 批量查询ToProductImageRecord数据 -->
     <select id="getToProductImageRecordBatch" resultType="java.util.Map">
-        SELECT 
+        SELECT
             id as record_id,
             prompt
         FROM to_product_image_record
-        WHERE id IN 
+        WHERE id IN
         <foreach collection="recordIds" item="recordId" open="(" close=")" separator=",">
             #{recordId}
         </foreach>