Commit b74150090955d9e68a3e8e69c80494b7855e4a5c

Authored by pengye
1 parent 8ff0d268

no message

@@ -1780,7 +1780,7 @@ class Seller extends Common @@ -1780,7 +1780,7 @@ class Seller extends Common
1780 //检测是否为代理商 1780 //检测是否为代理商
1781 $rs = Db::query("SELECT 1781 $rs = Db::query("SELECT
1782 dv.type, 1782 dv.type,
1783 - uu.nick_name as nickname, 1783 + uu.nick_name,
1784 r.tid, 1784 r.tid,
1785 r.tableinfo, 1785 r.tableinfo,
1786 r.id, 1786 r.id,
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 {field: 'tablename', title: '包间名称'}, 113 {field: 'tablename', title: '包间名称'},
114 {field: 'room_demand', title: '包间需求'}, 114 {field: 'room_demand', title: '包间需求'},
115 {field: 'rname', title: '客户信息'}, 115 {field: 'rname', title: '客户信息'},
116 - {field: 'nickname', title: '微信昵称'}, 116 + {field: 'nick_name', title: '微信昵称'},
117 {field: 'cusdem', title: '备注'}, 117 {field: 'cusdem', title: '备注'},
118 {field: 'cdate',title: '下单时间'}, 118 {field: 'cdate',title: '下单时间'},
119 {field: 'dv', title: '商家设备'}, 119 {field: 'dv', title: '商家设备'},