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

liyong

18 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

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


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



    /**
     * 金额