上传

application/admin/controller/User.php

@@ -84,25 +84,6 @@ class User extends AuthBase
         $mulit_arr = [];
         $mulit_arr = [];
         $mulit_arr['data'] = [];
         $mulit_arr['data'] = [];
         $cont = [['真实姓名','微信号','昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
         $cont = [['真实姓名','微信号','昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间']];
-<<<<<<< HEAD
-//            [
-//                'data'=>
-//                    [
-//                        [
-//                            ['昵称','性别','电话','是否是会员','注册时间','更新时间','会员到期时间'],
-//                            ['a','b','c'],
-//                            ['d','e','f']
-//                        ]
-//                    ],
-            //        'sheet'=>
-            //   [
-            //       ['title'=>'工作空间1名称']，
-            //        ['title'=>'工作空间2名称']，
-            //   ]
-//            ];
-=======
-
->>>>>>> 5d590c1903c67ef1e2f127fec2999b966fdcfe3d
         foreach ($user_list as $vo){
         foreach ($user_list as $vo){
             $arr = [];
             $arr = [];
             $arr[] = $vo['name'];
             $arr[] = $vo['name'];