Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

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

@@ -93,6 +93,8 @@
            <if test="isdgf != null  and isdgf != ''">and IsDGF = #{isdgf}</if>
            <if test="organStartTime != null">and organ_start_time = #{organStartTime}</if>
        </where>
        <!-- 2026-10-23：按器官排队序号排序（空的排最后，再按主键兜底） -->
        order by (sort is null or sort = 0), sort asc, ID asc
    </select>

</mapper>