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

xiaoyong931011

2021-05-28 ba00b9ce351642f3f70bc7ff24646c921bfb47cb

 src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java

@@ -47,6 +47,8 @@

    @ApiModelProperty(value = "商家MemberId")
    private Long saleMemberId;
    @ApiModelProperty(value = "memberId")
    private Long memberId;

    @ApiModelProperty(value = "商家ID")
    private Long mbId;