Merge remote-tracking branch 'origin/main'

# Conflicts:
#	bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml

bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/DataSetEntity.java

@@ -53,7 +53,9 @@ public class DataSetEntity extends BaseEntity {
     /**数据集关联的文件id*/
     private Long[] fileIds;
 
+    /**查询使用*/
     private Integer annotatedCount;
 
     private Integer notAnnotatedCount;
+    private String latestVersionName;
 }

bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml

@@ -34,7 +34,8 @@
         <if test="versionName != null and versionName != ''">
             AND version_name LIKE CONCAT('%', #{versionName}, '%')
         </if>
+        GROUP BY ap.task_id, atv.create_time
         ORDER BY atv.create_time DESC
-        GROUP BY ap.task_id
+
     </select>
 </mapper>