feat: 发货审批根据合同号合并到第一条(未审批)的记录中

buhuazhen

2026-05-29 acaf0e69a594f36ef9be6749c2b8d66e4ef6123b

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

@@ -47,7 +47,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