Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml

@@ -24,10 +24,20 @@
            <if test="criteria.reasonStatus != null">
                and reason_status = #{criteria.reasonStatus}
            </if>
            <if test="criteria.reasonName != null">
                and reason_name like concat('%',#{criteria.reasonName},'%')
            </if>
            <if test="criteria.createTime != null and criteria.createTime.size() > 0">
                AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
            </if>
        </where>
        order by reason_id desc
        order by sort desc
    </select>
</mapper>
    <select id="miniQuery" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from sh_order_return_reason
        where reason_status = true
        order by sort desc
    </select>
</mapper>