Merge remote-tracking branch 'origin/roc-bak' into roc-bak

zainali5120

2020-11-11 0730d0e9b5714394241cb3a19f3be38a40c46f7c

 src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java

@@ -78,4 +78,6 @@
   private String phone;
   private String email;

   private Integer ipo;

}