Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/resources/messages_en.properties

src/main/java/com/ai/da/mapper/GenerateDetailMapper.java

@@ -3,5 +3,15 @@ package com.ai.da.mapper;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.entity.GenerateDetail;
 
+import java.util.List;
+import java.util.Map;
+
 public interface GenerateDetailMapper extends CommonMapper<GenerateDetail> {
+    /**
+     * 查找相同MD5相同level1Type 被like过的图片的libraryId
+     * @param md5 图片的MD5值
+     * @param level1Type levelType
+     * @return libraryId
+     */
+    List<Map<String,Long>> getLibraryIdThroughMD5(String md5, String level1Type);
 }