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

云

2026-06-09 23c8604bc54ba3f20b0bf00a2649895c8e096a05

 src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml

@@ -44,6 +44,7 @@
                AND app.payment_date BETWEEN #{req.startDate} AND #{req.endDate}
            </if>
        </where>
        order by app.id desc
    </select>
    <select id="selectPayment" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
        SELECT DATE_FORMAT(payment_date, #{dateFormat}) AS dateStr,