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

yuan

2 天以前 d33d9a69500b79256371aa81f4be729128ffd745

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

 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">

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

@@ -19,5 +19,6 @@
        <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
            AND t1.status = #{salesQuotationDto.status}
        </if>
        order by t1.quotation_no desc
    </select>
</mapper>