Merge remote-tracking branch 'origin/main'

# Conflicts:
#	zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java

zhyc-module/src/main/resources/mapper/produce/breed/ScWeanRecordMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhyc.module.produce.breed.mapper.ScWeanRecordMapper">
 
-    <resultMap type="ScWeanRecord" id="ScWeanRecordResult">
+    <resultMap type="com.zhyc.module.produce.breed.domain.ScWeanRecord" id="ScWeanRecordResult">
         <result property="id"    column="id"    />
         <result property="sheepId"    column="sheep_id"    />
         <result property="datetime"    column="datetime"    />
@@ -94,13 +94,6 @@
         order by wr.create_time desc
     </select>
 
-    <select id="searchEarNumbers" resultType="String">
-        SELECT DISTINCT bs_manage_tags
-        FROM sheep_file
-        WHERE bs_manage_tags LIKE CONCAT('%', #{query}, '%')
-          AND is_delete = 0
-            LIMIT 20
-    </select>
 
     <select id="selectScWeanRecordById" parameterType="Long" resultMap="ScWeanRecordResult">
         <include refid="selectScWeanRecordVo"/>