Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml

@@ -182,6 +182,8 @@
            <if test="isdgf != null ">and isDGF = #{isdgf}</if>

        </where>
        <!-- 2026-10-23：按器官排队序号排序（空的排最后，再按主键兜底） -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>
    <select id="getAllDonateOrgans" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
        <include refid="selectServiceDonateorganVo"/>