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

云

2026-05-07 91038896d296db86b5dc166777dcdbf8ff2ea56f

 src/main/resources/mapper/account/AccountExpenseMapper.xml

@@ -59,7 +59,7 @@
        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
            AND expense_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
        group by expense_type
        group by sdd.dict_label, ae.expense_type
    </select>

    <select id="report1" resultType="java.math.BigDecimal">