Merge remote-tracking branch 'origin/dev' into dev

2023-12-25 10:59:35 +08:00 · 2023-12-25 10:59:35 +08:00 · b0234660cb
parent dd7a91b9a7 e31a99a17e
commit b0234660cb
1 changed files with 1 additions and 0 deletions
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@ -327,6 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and #{endTime} >=bai.back_time
        </if>
        GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+        ORDER BY bai.create_time desc
    </select>

    <select id="getMaterialList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">