Merge remote-tracking branch 'origin/main'

zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml

@@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="statusId != null "> and status_id = #{statusId}</if>
             <if test="breed != null  and breed != ''"> and breed = #{breed}</if>
         </where>
+        ORDER BY id ASC  <!-- 修改为升序 -->
     </select>
     
     <select id="selectSheepFileById" parameterType="Long" resultMap="SheepFileResult">
@@ -260,7 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        ORDER BY id DESC
+        ORDER BY id ASC
     </select>
 
 <!--    &lt;!&ndash; 查询所有公羊（gender=2） &ndash;&gt;-->