Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-27 6712b6d4d3bd39713d387fead75b7d65f8d157c2

 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml

@@ -64,6 +64,12 @@
            <if test="allocation.endTime != null and allocation.endTime !='' ">
                and date(t1.escalation_time) <![CDATA[<=]]>  #{allocation.endTime}
            </if>
            <if test="allocation.unitList != null and allocation.unitList.size !=0">
                and t1.unit_id in
                <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
                    #{id}
                </foreach>
            </if>

        </where>
        order by t1.escalation_time desc,t1.allocation_id desc