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

yaowanxin

昨天 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 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;