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

gongchunyi

昨天 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 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;