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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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


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



    /**
     * 金额