Merge dev_New_pro into dev_山西_晋和园_pro

gongchunyi

2026-05-28 10b88a7ff17caf92f3d4e8a550c1085a70c2517a

 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,