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

zainali5120

2020-11-11 0730d0e9b5714394241cb3a19f3be38a40c46f7c

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

@@ -219,6 +219,11 @@
   @TableField(exist = false)

   private int accountType;

   /**

    * 姓名

    */

   @TableField(exist = false)

   private String realName;

   /**

    * 查询条件：账号类型

    */

   @TableField(exist = false)