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

zss

6 天以前 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3

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

@@ -66,7 +66,7 @@
            AND income_method = #{accountIncome.incomeMethod}
        </if>
    </select>
    <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
    <select id="report" resultType="com.ruoyi.account.bean.dto.AccountDto2">
        SELECT
        sdd.dict_label typeName,
        ifnull(sum(income_money),0) account