Authored by 马力

Merge branch 'dev_优惠券优化' into grey

... ... @@ -322,7 +322,7 @@ var g = new common.grid({
}
}, {
display: '搜索/标签',
hidden: true,
hidden: false,
render: function (item) {
var searchAndLabel = item.searchAndLabel ? item.searchAndLabel : '',
style = item.style ? item.style : '',
... ...