Merge branch 'master' of http://114.215.101.231:8099/guosheng/enterprise into heshupeng

@@ -669,7 +669,7 @@ class User extends Api
 
         
         $file_path = "$id.png";
-        $image = \think\Image::open(ROOT_PATH."public/uploads/yuan.png");
+        $image = \think\Image::open(ROOT_PATH."public/assets/img/yuan.png");
         $path_ttf = ROOT_PATH.'public/assets/fonts/PingFang.ttf';
         $year = date('Y');
         //证书编号

@@ -21,6 +21,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'user.id',
+                exportOptions: {
+                    // type: 'excel',
+                    mso:{
+                        // fileFormat:        'xlsx',
+                        //修复导出数字不显示为科学计数法
+                        onMsoNumberFormat: function (cell, row, col) {
+                            return !isNaN($(cell).text())?'\\@':'';
+                        }
+                    }
+                },
                 columns: [
                     [
                         {checkbox: true},