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

Helius

2021-11-24 be6f79a634727b59c6a40e3fffa989b5de1b0ec7

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

@@ -9,6 +9,7 @@
@ApiModel(value = "OwnCannonVo", description = "金币账户")
public class OwnCannonVo {

    private Long id;
    private Long memberId;
    @ApiModelProperty(value = "炮台UUID")//炮台UUID
    private String cannonUuid;