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

xiaoyong931011

2021-05-12 f1ad6e801cc68cfe90efb620df3484293044aea3

 src/main/java/com/xcong/excoin/modules/yunding/entity/YdProductEntity.java

@@ -90,10 +90,16 @@
    private Integer type;

    /**
     * 1:期货 2：现货
     * 产品类型1:期货 2：现货
     */

    private Integer typeCoin;

    /**
     * 优惠 1：免除电费
     */

    private Integer favourable;


}