Merge branch 'master' of http://120.27.238.55:7000/r/exchange-back

xiaoyong931011

2021-03-26 48c3fa5761f4eb5f7e134cce28a6d887156c34d1

 src/main/java/com/xcong/excoin/modules/dataMonitoring/entity/DataMonitoringEntity.java

@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import com.xcong.excoin.common.utils.BigDecimalSerialize;



import lombok.Data;



@@ -41,6 +43,7 @@
    /**

     * 总盈亏

     */

    @JsonSerialize(using = BigDecimalSerialize.class)

    private BigDecimal reward;

    /**

     *不符合条件的订单数量