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/entity/OtcEntrustOrder.java

@@ -75,5 +75,5 @@
    @TableField(exist = false)
    private String payType;
    @TableField(exist = false)
    private Integer isDefault;
    private Integer isDefualt;
}