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

zss

昨天 40946ba6c24a0318f14cbed603f0ed9cad1da853

 src/main/java/com/ruoyi/dto/MapDto.java

@@ -18,7 +18,7 @@
    private String name;

    @ApiModelProperty(value = "数量")
    private BigDecimal value;
    private String value;

    @ApiModelProperty(value = "占比")
    private String rate;