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

liyong

17 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 src/main/resources/mapper/production/SalesLedgerWorkMapper.xml

@@ -54,6 +54,6 @@
                AND  t4.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by t4.update_time desc
        order by t4.scheduling_date desc
    </select>
</mapper>