Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish

xiaoyong931011

2021-11-25 5ffa4ccd62c2f32b5808e0a5f6c9a65142c201ff

 src/main/java/com/xcong/excoin/modules/fish/vo/CannonSettingVo.java

@@ -18,7 +18,7 @@
    private String code;
    @ApiModelProperty(value = "兑换价格")//兑换价格
    private BigDecimal exchangePrice;
    @ApiModelProperty(value = "1发炮弹消耗金币数")//消耗金币
    @ApiModelProperty(value = "每发炮弹消耗金币数")//消耗金币
    private BigDecimal goldConsume;

}