Compare commits

...

2 Commits

Author SHA1 Message Date
591b6d537f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	zhyc-module/src/main/java/com/zhyc/module/produce/breed/controller/ScWeanRecordController.java
2026-02-07 14:36:09 +08:00
928fe4d9bc bug修改 2026-02-07 14:35:36 +08:00

View File

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.produce.breed.mapper.ScWeanRecordMapper"> <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="id" column="id" />
<result property="sheepId" column="sheep_id" /> <result property="sheepId" column="sheep_id" />
<result property="datetime" column="datetime" /> <result property="datetime" column="datetime" />
@@ -94,13 +94,6 @@
order by wr.create_time desc order by wr.create_time desc
</select> </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"> <select id="selectScWeanRecordById" parameterType="Long" resultMap="ScWeanRecordResult">
<include refid="selectScWeanRecordVo"/> <include refid="selectScWeanRecordVo"/>