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

gongchunyi

2 天以前 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 src/main/java/com/ruoyi/account/dto/AccountDto2.java

@@ -22,6 +22,12 @@
    private String typeName;


    /**
     * 百分占比
     */
    private BigDecimal proportion;



    /**
     * 金额