Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

6 天以前 c0fe393c6a5877076a7b5646b3aee01448e84a98

 src/main/resources/mapper/sales/SalesLedgerMapper.xml

@@ -95,7 +95,7 @@
                AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by T1.entry_date desc
        order by T1.entry_date desc, T1.sales_contract_no desc
    </select>

    <select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">