From bb34b1893909ac35b9c36c2a87f7127901965d58 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 16 Nov 2020 21:16:34 +0800
Subject: [PATCH] Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into cpv-back

---
 src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html b/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
index 1c3da65..3a48a34 100644
--- a/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
+++ b/src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html
@@ -109,6 +109,17 @@
                     {field: 'entrustPrice', title: '委托价', minWidth: 30,align:'center'},
                     {field: 'dealPrice', title: '成交价', minWidth: 30,align:'center'},
                     {field: 'dealAmount', title: '成交金额', minWidth: 30,align:'center'},
+                    {field: 'ipo', title: '私募',
+                        templet: function (d) {
+                            if (d.ipo == 1) {
+                                return '<span style="color:red;">是</span>'
+                            } else if (d.ipo == 0) {
+                                return '<span style="color:gray;">否</span>'
+                            } else{
+                                return '<span style="color:red;">是</span>'
+                            }
+                        },
+                        minWidth: 20,align:'center'},
                     {field: 'feeAmount', title: '手续费', minWidth: 30,align:'center'},
                     {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},
                 ]]

--
Gitblit v1.9.1