Merge branch 'phoenix' into develop

# Conflicts:
#	app/Admin/routes.php

app/Admin/Controllers/v3/SystemConfigController.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Admin\Controllers\v3;
+
+use App\Admin\Repositories\v3\SystemConfig;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+use App\Models\v3\SystemConfig as SystemConfigModel;
+use App\Libs\SsdbClient;
+use App\Constants\v3\SsdbKeys;
+
+class SystemConfigController extends AdminController
+{
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new SystemConfig(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('menu_name');
+            $grid->column('info');
+            $grid->column('value');
+            $grid->column('category_text');
+            $grid->column('sort');
+            $grid->column('status')->switch();
+
+            $grid->model()->orderby('id','desc');
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+                $filter->like('menu_name');
+                $filter->equal('category')->select(SystemConfigModel::$_CATEGORY);
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new SystemConfig(), function (Show $show) {
+            $menuName = $show->model()->menu_name;
+            $show->field('id');
+            $show->field('menu_name');
+            $show->field('category_text');
+            $show->field('value')->width(6);
+            if($menuName == 'initial_delivery_amount'){
+                $delivery =  SsdbClient::client()->get(SsdbKeys::INTIAL_DELIVERY_AMOUNT);
+                $show->field('value_text','已存ssdb的值：')->width(6)->value($delivery);
+            }
+            $show->field('info');
+            $show->field('desc');
+            $show->field('sort');
+            $show->field('status_text');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new SystemConfig(), function (Form $form) {
+            $menuName = $form->model()->menu_name;
+            $form->hidden('id');
+            
+            $form->text('menu_name')->width(4)->required()->rules('regex:/^[0-9a-z_]{1,}$/',['regex'=>'只能输入数字、小写字母和下划线'])->help('本字段在添加成功后不能编辑！');
+            $form->select('category')->width(4)->options(SystemConfigModel::$_CATEGORY);
+            $deliveryForm = $form->text('value')->required()->width(6)->maxLength(100);
+
+            if($menuName == 'initial_delivery_amount'){
+                $delivery =  SsdbClient::client()->get(SsdbKeys::INTIAL_DELIVERY_AMOUNT);
+                $deliveryForm->help('已存ssdb的值：'.$delivery);
+            }
+
+            $form->text('info')->maxLength(255);
+            $form->text('desc')->maxLength(500);
+            $form->number('sort')->width(2)->default(0);
+
+            $form->saving(function(Form $form){
+                $id = $form->input('id');
+                $menuName = $form->input('menu_name');
+                if($id && $menuName ){
+                    $form->deleteInput('menu_name');
+                }
+                if($id && $menuName == 'initial_delivery_amount'){
+                    $delivery = $form->input('value');
+                    SsdbClient::client()->set(SsdbKeys::INTIAL_DELIVERY_AMOUNT,$delivery);
+                }
+            });
+            $form->switch('status')
+                ->customFormat(function ($v) {
+                    return $v == 1 ? 1 : 0;
+                })
+                ->saving(function ($v) {
+                    return $v == 1 ? 1 : 0;
+            });
+
+            $form->disableResetButton();
+            $form->disableViewCheck();
+            $form->disableEditingCheck();
+            $form->disableCreatingCheck();
+        });
+    }
+}

app/Admin/Forms/CategoryTieForm.php

@@ -10,9 +10,6 @@ use Illuminate\Support\Facades\DB;
 
 class CategoryTieForm extends Form
 {
-
-    protected $ssdb;
-
     /**
      * Handle the form request.
      *
@@ -37,9 +34,9 @@ class CategoryTieForm extends Form
            
             if(count($data) > 0){
 
-                $this->ssdb->client()->hclear('applet_index_category');
+                SsdbClient::client()->hclear('applet_index_category');
 
-                $category = $this->ssdb->client()->multi_hset('applet_index_category',$data);
+                $category = SsdbClient::client()->multi_hset('applet_index_category',$data);
 
                 if($category === false){
                     return $this->error('绑定失败');
@@ -55,8 +52,7 @@ class CategoryTieForm extends Form
      */
     public function form()
     {
-        $this->ssdb = new SsdbClient();
-        $category = $this->ssdb->client()->hgetall('applet_index_category');
+        $category = SsdbClient::client()->hgetall('applet_index_category');
         $select = array_keys($category);
 
         // 只查一级

app/Admin/Forms/CouponTieForm.php

@@ -8,11 +8,6 @@ use App\Libs\SsdbClient;
 
 class CouponTieForm extends Form
 {
-    /**
-     * 
-    */
-    protected $ssdb;
-
     /**
      * Handle the form request.
      *
@@ -29,7 +24,7 @@ class CouponTieForm extends Form
             'repay'  => $input['repay'],
         ];
         
-        $coupon = $this->ssdb->client()->multi_hset('coupon_rebate_activity',$data);
+        $coupon = SsdbClient::client()->multi_hset('coupon_rebate_activity',$data);
         if($coupon === false){
             return $this->error('修改失败');
         }
@@ -42,8 +37,7 @@ class CouponTieForm extends Form
      */
     public function form()
     {
-        $this->ssdb = new SsdbClient();
-        $coupon = $this->ssdb->client()->hgetall('coupon_rebate_activity');
+        $coupon = SsdbClient::client()->hgetall('coupon_rebate_activity');
         if(empty($coupon)){
             $coupon = [
                 'activity'=> 0,

app/Admin/Repositories/v3/SystemConfig.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories\v3;
+
+use App\Models\v3\SystemConfig as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class SystemConfig extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/routes.php

@@ -58,10 +58,12 @@ Route::group([
     $router->resource('/goods_activity', 'v3\GoodsActivityController');
     $router->resource('/goods_new', 'v3\GoodsNewController');
 
-    // banner
+    // 平台管理
     $router->resource('/banners', 'v3\BannersController');
+	$router->resource('/system_config', 'v3\SystemConfigController');
 	
 	$router->resource('/order', 'ImsCjdcOrderMainController');
+	$router->resource('/order', 'ImsCjdcOrderMainController');
     $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail');
     $router->any('/order_goods_refund', 'ImsCjdcOrderMainController@orderGoodsRefund');
 

app/Console/Commands/MigrateUserAddr.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class MigrateUserAddr extends Command
 {
@@ -19,7 +20,7 @@ class MigrateUserAddr extends Command
      *
      * @var string
      */
-    protected $description = 'migrate user addr data';
+    protected $description = 'migrate 迁移用户地址数据';
 
     /**
      * Create a new command instance.
@@ -39,23 +40,41 @@ class MigrateUserAddr extends Command
     public function handle()
     {
 
-        // get old data from old table
-        $oldData = DB::table('ims_cjdc_useradd')->get();
+        $oldTableName = 'ims_cjdc_useradd';
+        $newTableName = 'lanzu_user_address';
+        // 判断表是否存在
+        if(!Schema::hasTable($oldTableName)){
+            var_dump('旧表不存在');
+            return 0;
+        }
+        if(!Schema::hasTable($newTableName)){
+            var_dump('新表不存在');
+            return 0;
+        }
+        $oldData = DB::table($oldTableName)->get();
 
         $bar = $this->output->createProgressBar(count($oldData));
         $bar->start();
 
         $newData = [];
         foreach ($oldData as $key => $value) {
+
+            $addressArr = explode('|',$value->address);
+            $address = $addressArr[0];
+            $doorplate = isset($addressArr[1])?$addressArr[1]:''; 
+
             $newData[] = [
-                'user_id' => $value->user_id ?? '',
-                'user_name' => $value->user_name ?? '',
-                'address' => $value->address ?? '',
+                'id' => $value->id,
+                'user_id' => $value->user_id ?? 0,
+                'user_name' => $value->user_name == 'undefined'? '': $value->user_name,
+                'address' => $address,
                 'gender' => $value->sex ?? 0,
                 'lat' => $value->lat ?? '',
                 'lng' => $value->lng ?? '',
-                'tel' => $value->tel ?? '',
-                'tags' => json_encode([]),
+                'tel' =>  $value->tel == 'undefined'? '': $value->tel,
+                'doorplate' => $doorplate,
+                'is_default' => $value->is_default ?? 0,
+                'tags' => json_encode(''),
                 'created_at' => time(),
                 'updated_at' => time(),
             ];

app/Constants/v3/SsdbKeys.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Constants\v3;
+
+/**
+ * @Constants
+ */
+class SsdbKeys
+{
+    /**
+     * @Message("短信验证码")
+     */
+    const VERIFY_CODE = 'verify_code_';
+
+    /**
+     * @Message("商品月销")
+     */
+    const GOODS_MONTH_SALES = 'goods_m_sales_';
+
+    /**
+     * @Message("商户月销")
+     */
+    const STORE_MONTH_SALES = 'store_m_sales_';
+
+    /**
+     * @Message("收藏店铺")
+     */
+    const COLLECT_STORE_USER = 'collect_store_user_';
+
+    /**
+     * @Message("用户收藏店铺数量")
+     */
+    const COUNT_COLLECT_STORE_USER = 'count_collect_store_user_';
+
+    /**
+     * @Message("店铺被收藏数量")
+     */
+    const COUNT_COLLECT_STORE = 'count_collect_store_';
+
+    /**
+     * @Message("首页分类")
+     */
+    const APPLET_INDEX_CATEGORY = 'applet_index_category';
+
+    /**
+     * @Message("用户信息")
+     */
+    const USER_INFO = 'user_info_';
+
+    /**
+     * @Message("用户活动商品限购记录")
+     */
+    const ACTIVITY_GOODS_BUY_RECORD = 'activity_goods_buy_record_';
+
+    /**
+     * @Message("优惠券返券活动")
+     */
+    const COUPON_REBATE_ACTIVITY = 'coupon_rebate_activity';
+
+    /**
+     * @Message("优惠券返券领券")
+     */
+    const COUPON_REBATE_RECEIVE = 'coupon_rebate_receive_';
+
+    /**
+     * @Message("优惠券返券列表")
+     */
+    const COUPON_REBATE_LIST = 'coupon_rebate_list_';
+
+    /**
+     * @Message("起送价")
+     */
+    const INTIAL_DELIVERY_AMOUNT = 'intial_delivery_amount';
+}

app/Models/v3/Store.php

@@ -17,8 +17,8 @@ class Store extends Model
     /* 查询记录数 limit */
     protected $perPage = 10;
 
-    public static $_isRest= ['否','是'];
-    public static $_isOpen = ['关闭','开启'];
+    public static $_ISREST= ['否','是'];
+    public static $_ISOPEN = ['关闭','开启'];
 
     protected $appends = [
         'logo_url',
@@ -35,12 +35,12 @@ class Store extends Model
     public function getIsRestTextAttribute($value)
     {
         $value = $value ? $value : $this->is_rest;
-        return isset(self::$_onRest[$value]) ? self::$_onRest[$value] : '';
+        return isset(self::$_ISREST[$value]) ? self::$_ISREST[$value] : '';
     }
     public function getIsOpenTextAttribute($value)
     {
         $value = $value ? $value : $this->is_iopen;
-        return isset(self::$_isOpen[$value]) ? self::$_isOpen[$value] : '';
+        return isset(self::$_ISOPEN[$value]) ? self::$_ISOPEN[$value] : '';
     }
 
     /**

app/Models/v3/SystemConfig.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Models\v3;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class SystemConfig extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'lanzu_system_config';
+    protected $dateFormat = 'U';
+
+    /* 查询记录数 limit */
+    protected $perPage = 10;
+
+    public static $_CATEGORY= [1=>'奖励类',2=>'店铺设置类',3=>'市场管理后台配置',4=>'订单相关设置'];
+    public static $_STATUS = ['禁用','启用'];
+
+    protected $appends = [
+        'category_text',
+        'status_text'
+    ];
+
+    public function getCategoryTextAttribute($value)
+    {
+        $value = $value ? $value : $this->category;
+        return isset(self::$_CATEGORY[$value]) ? self::$_CATEGORY[$value] : '';
+    }
+    public function getStatusTextAttribute($value)
+    {
+        $value = $value ? $value : $this->status;
+        return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
+    }
+
+    /**
+     * 根据id获取单条信息
+     * @param int $id
+     * @param string $field
+     * @return string
+     */
+    public static function getInfo($id,$field = '*')
+    {
+        return self::select($field)->find($id);
+    }
+
+    /**
+     * 获取数组
+     * id为键
+     * @return array
+     */
+    public static function getArray($where = [], $options = [])
+    {
+        $model = self::whereNull('deleted_at');
+
+        if(!empty($where)){
+            $model->where($where);
+        }
+        $list = $model->pluck('id','value')->toArray();
+        if(!empty($options)){
+            $new =  array_merge($options,$list);
+            return array_flip($new);
+        }else{
+            return array_flip($list);
+        }
+    }
+}

dcat_admin_ide_helper.php

@@ -47,12 +47,13 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection loudspeaker_imei
      * @property Grid\Column|Collection dishes_menu_intro
      * @property Grid\Column|Collection create_time
-     * @property Grid\Column|Collection tel
+     * @property Grid\Column|Collection logo_url
+     * @property Grid\Column|Collection mm_user_id
+     * @property Grid\Column|Collection store_applet_img
+     * @property Grid\Column|Collection cash_code_img
      * @property Grid\Column|Collection is_rest
-     * @property Grid\Column|Collection award_money
-     * @property Grid\Column|Collection img
-     * @property Grid\Column|Collection start_at
-     * @property Grid\Column|Collection freight
+     * @property Grid\Column|Collection is_open
+     * @property Grid\Column|Collection width
      * @property Grid\Column|Collection money
      * @property Grid\Column|Collection mp_id
      * @property Grid\Column|Collection is_pay
@@ -65,20 +66,35 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection activity
      * @property Grid\Column|Collection forward
      * @property Grid\Column|Collection repay
-     * @property Grid\Column|Collection category
+     * @property Grid\Column|Collection category_text
      * @property Grid\Column|Collection value
+     * @property Grid\Column|Collection start_time_text
+     * @property Grid\Column|Collection end_time_text
+     * @property Grid\Column|Collection full_amount
+     * @property Grid\Column|Collection discounts
+     * @property Grid\Column|Collection discount_type_text
+     * @property Grid\Column|Collection inventory
+     * @property Grid\Column|Collection inventory_use
+     * @property Grid\Column|Collection use_number
+     * @property Grid\Column|Collection active_type_text
+     * @property Grid\Column|Collection usable_start_time_text
+     * @property Grid\Column|Collection usable_end_time_text
+     * @property Grid\Column|Collection receive_type_text
+     * @property Grid\Column|Collection type_text
+     * @property Grid\Column|Collection storetype_id
+     * @property Grid\Column|Collection is_new_user_text
+     * @property Grid\Column|Collection usable_number
+     * @property Grid\Column|Collection weigh
+     * @property Grid\Column|Collection status_text
+     * @property Grid\Column|Collection created_at_text
+     * @property Grid\Column|Collection updated_at_text
      * @property Grid\Column|Collection store_id
      * @property Grid\Column|Collection store_name
      * @property Grid\Column|Collection new_user_total
-     * @property Grid\Column|Collection mm_user_id
-     * @property Grid\Column|Collection logo_url
-     * @property Grid\Column|Collection store_applet_img
-     * @property Grid\Column|Collection cash_code_img
-     * @property Grid\Column|Collection is_open
-     * @property Grid\Column|Collection width
      * @property Grid\Column|Collection cover_img_url
-     * @property Grid\Column|Collection category_id
      * @property Grid\Column|Collection price
+     * @property Grid\Column|Collection category_id
+     * @property Grid\Column|Collection goods_category_id
      * @property Grid\Column|Collection on_sale
      * @property Grid\Column|Collection parent_id
      * @property Grid\Column|Collection order
@@ -138,7 +154,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection group_id
      * @property Grid\Column|Collection condition
      * @property Grid\Column|Collection ismenu
-     * @property Grid\Column|Collection weigh
      * @property Grid\Column|Collection flag
      * @property Grid\Column|Collection image
      * @property Grid\Column|Collection keywords
@@ -261,6 +276,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection item
      * @property Grid\Column|Collection area_name
      * @property Grid\Column|Collection num
+     * @property Grid\Column|Collection img
      * @property Grid\Column|Collection stars
      * @property Grid\Column|Collection time
      * @property Grid\Column|Collection order_id
@@ -329,7 +345,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection vip_money
      * @property Grid\Column|Collection dn_money
      * @property Grid\Column|Collection is_show
-     * @property Grid\Column|Collection inventory
      * @property Grid\Column|Collection sales
      * @property Grid\Column|Collection is_gg
      * @property Grid\Column|Collection is_hot
@@ -341,7 +356,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection start_num
      * @property Grid\Column|Collection dn_hymoney
      * @property Grid\Column|Collection is_max
-     * @property Grid\Column|Collection goods_unit
+     * @property Grid\Column|Collection good_unit
      * @property Grid\Column|Collection goods_id
      * @property Grid\Column|Collection goods_logo
      * @property Grid\Column|Collection goods_name
@@ -399,6 +414,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection ziti_pay_temp
      * @property Grid\Column|Collection dada_number
      * @property Grid\Column|Collection is_open_dada
+     * @property Grid\Column|Collection tel
      * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection sender
      * @property Grid\Column|Collection is_email
@@ -541,6 +557,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection sss_shop_token
      * @property Grid\Column|Collection time4
      * @property Grid\Column|Collection announcement
+     * @property Grid\Column|Collection start_at
+     * @property Grid\Column|Collection freight
      * @property Grid\Column|Collection yyzz
      * @property Grid\Column|Collection md_area
      * @property Grid\Column|Collection md_type
@@ -567,7 +585,9 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection store_mchid
      * @property Grid\Column|Collection cash_code
      * @property Grid\Column|Collection store_wallet
+     * @property Grid\Column|Collection award_money
      * @property Grid\Column|Collection add_time
+     * @property Grid\Column|Collection category
      * @property Grid\Column|Collection xyh_open
      * @property Grid\Column|Collection is_jd
      * @property Grid\Column|Collection is_jfpay
@@ -1030,13 +1050,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection hit
      * @property Grid\Column|Collection count
      * @property Grid\Column|Collection ip_count
-     * @property Grid\Column|Collection full_amount
-     * @property Grid\Column|Collection discounts
      * @property Grid\Column|Collection is_new_user
-     * @property Grid\Column|Collection inventory_use
-     * @property Grid\Column|Collection storetype_id
      * @property Grid\Column|Collection active_type
-     * @property Grid\Column|Collection usable_number
      * @property Grid\Column|Collection usable_start_time
      * @property Grid\Column|Collection usable_end_time
      * @property Grid\Column|Collection add_user_id
@@ -1155,9 +1170,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection brand_name
      * @property Grid\Column|Collection success
      * @property Grid\Column|Collection error
-* @property Grid\Column|Collection qrcode_path
-     * @property Grid\Column|Collection admin_user_id
-     * @property Grid\Column|Collection cs_id
      * @property Grid\Column|Collection market_ids
      * @property Grid\Column|Collection sub_title
      * @property Grid\Column|Collection cover
@@ -1165,8 +1177,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection path_type
      * @property Grid\Column|Collection bg_color
      * @property Grid\Column|Collection cover_img
-     * @property Grid\Column|Collection storetype_ids
      * @property Grid\Column|Collection activity_available
+     * @property Grid\Column|Collection tags
      * @property Grid\Column|Collection person_id
      * @property Grid\Column|Collection qrcode_path
      * @property Grid\Column|Collection user_type
@@ -1177,7 +1189,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection vip_price
      * @property Grid\Column|Collection is_infinite
      * @property Grid\Column|Collection goods_unit
-     * @property Grid\Column|Collection tags
      * @property Grid\Column|Collection details_imgs
      * @property Grid\Column|Collection expire_time
      * @property Grid\Column|Collection time_limit_days
@@ -1194,6 +1205,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection services_money
      * @property Grid\Column|Collection coupon_money
      * @property Grid\Column|Collection delivery_money
+     * @property Grid\Column|Collection horseman_id
      * @property Grid\Column|Collection delivery_time_note
      * @property Grid\Column|Collection total_refund_note
      * @property Grid\Column|Collection c_attitude
@@ -1214,14 +1226,11 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection join_ip
      * @property Grid\Column|Collection last_visit_time
      * @property Grid\Column|Collection last_ip
-     * @property Grid\Column|Collection store_users_id
-     * @property Grid\Column|Collection apply_time
+     * @property Grid\Column|Collection trade_no
      * @property Grid\Column|Collection check_time
      * @property Grid\Column|Collection apply_cash
      * @property Grid\Column|Collection real_cash
      * @property Grid\Column|Collection bank_info
-     * @property Grid\Column|Collection store_type_id
-     * @property Grid\Column|Collection goods_type_id
      * @property Grid\Column|Collection nick_name
      * @property Grid\Column|Collection real_name
      * @property Grid\Column|Collection doorplate
@@ -1265,12 +1274,13 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection loudspeaker_imei(string $label = null)
      * @method Grid\Column|Collection dishes_menu_intro(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
-     * @method Grid\Column|Collection tel(string $label = null)
+     * @method Grid\Column|Collection logo_url(string $label = null)
+     * @method Grid\Column|Collection mm_user_id(string $label = null)
+     * @method Grid\Column|Collection store_applet_img(string $label = null)
+     * @method Grid\Column|Collection cash_code_img(string $label = null)
      * @method Grid\Column|Collection is_rest(string $label = null)
-     * @method Grid\Column|Collection award_money(string $label = null)
-     * @method Grid\Column|Collection img(string $label = null)
-     * @method Grid\Column|Collection start_at(string $label = null)
-     * @method Grid\Column|Collection freight(string $label = null)
+     * @method Grid\Column|Collection is_open(string $label = null)
+     * @method Grid\Column|Collection width(string $label = null)
      * @method Grid\Column|Collection money(string $label = null)
      * @method Grid\Column|Collection mp_id(string $label = null)
      * @method Grid\Column|Collection is_pay(string $label = null)
@@ -1283,21 +1293,35 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection activity(string $label = null)
      * @method Grid\Column|Collection forward(string $label = null)
      * @method Grid\Column|Collection repay(string $label = null)
-     * @method Grid\Column|Collection category(string $label = null)
+     * @method Grid\Column|Collection category_text(string $label = null)
      * @method Grid\Column|Collection value(string $label = null)
-	 * @method Grid\Column|Collection desc(string $label = null)
+     * @method Grid\Column|Collection start_time_text(string $label = null)
+     * @method Grid\Column|Collection end_time_text(string $label = null)
+     * @method Grid\Column|Collection full_amount(string $label = null)
+     * @method Grid\Column|Collection discounts(string $label = null)
+     * @method Grid\Column|Collection discount_type_text(string $label = null)
+     * @method Grid\Column|Collection inventory(string $label = null)
+     * @method Grid\Column|Collection inventory_use(string $label = null)
+     * @method Grid\Column|Collection use_number(string $label = null)
+     * @method Grid\Column|Collection active_type_text(string $label = null)
+     * @method Grid\Column|Collection usable_start_time_text(string $label = null)
+     * @method Grid\Column|Collection usable_end_time_text(string $label = null)
+     * @method Grid\Column|Collection receive_type_text(string $label = null)
+     * @method Grid\Column|Collection type_text(string $label = null)
+     * @method Grid\Column|Collection storetype_id(string $label = null)
+     * @method Grid\Column|Collection is_new_user_text(string $label = null)
+     * @method Grid\Column|Collection usable_number(string $label = null)
+     * @method Grid\Column|Collection weigh(string $label = null)
+     * @method Grid\Column|Collection status_text(string $label = null)
+     * @method Grid\Column|Collection created_at_text(string $label = null)
+     * @method Grid\Column|Collection updated_at_text(string $label = null)
      * @method Grid\Column|Collection store_id(string $label = null)
      * @method Grid\Column|Collection store_name(string $label = null)
      * @method Grid\Column|Collection new_user_total(string $label = null)
-     * @method Grid\Column|Collection mm_user_id(string $label = null)
-     * @method Grid\Column|Collection logo_url(string $label = null)
-     * @method Grid\Column|Collection store_applet_img(string $label = null)
-     * @method Grid\Column|Collection cash_code_img(string $label = null)
-     * @method Grid\Column|Collection is_open(string $label = null)
-     * @method Grid\Column|Collection width(string $label = null)
      * @method Grid\Column|Collection cover_img_url(string $label = null)
-     * @method Grid\Column|Collection category_id(string $label = null)
      * @method Grid\Column|Collection price(string $label = null)
+     * @method Grid\Column|Collection category_id(string $label = null)
+     * @method Grid\Column|Collection goods_category_id(string $label = null)
      * @method Grid\Column|Collection on_sale(string $label = null)
      * @method Grid\Column|Collection parent_id(string $label = null)
      * @method Grid\Column|Collection order(string $label = null)
@@ -1357,7 +1381,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection group_id(string $label = null)
      * @method Grid\Column|Collection condition(string $label = null)
      * @method Grid\Column|Collection ismenu(string $label = null)
-     * @method Grid\Column|Collection weigh(string $label = null)
      * @method Grid\Column|Collection flag(string $label = null)
      * @method Grid\Column|Collection image(string $label = null)
      * @method Grid\Column|Collection keywords(string $label = null)
@@ -1480,6 +1503,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection item(string $label = null)
      * @method Grid\Column|Collection area_name(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
+     * @method Grid\Column|Collection img(string $label = null)
      * @method Grid\Column|Collection stars(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection order_id(string $label = null)
@@ -1548,7 +1572,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection vip_money(string $label = null)
      * @method Grid\Column|Collection dn_money(string $label = null)
      * @method Grid\Column|Collection is_show(string $label = null)
-     * @method Grid\Column|Collection inventory(string $label = null)
      * @method Grid\Column|Collection sales(string $label = null)
      * @method Grid\Column|Collection is_gg(string $label = null)
      * @method Grid\Column|Collection is_hot(string $label = null)
@@ -1560,7 +1583,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection start_num(string $label = null)
      * @method Grid\Column|Collection dn_hymoney(string $label = null)
      * @method Grid\Column|Collection is_max(string $label = null)
-     * @method Grid\Column|Collection goods_unit(string $label = null)
+     * @method Grid\Column|Collection good_unit(string $label = null)
      * @method Grid\Column|Collection goods_id(string $label = null)
      * @method Grid\Column|Collection goods_logo(string $label = null)
      * @method Grid\Column|Collection goods_name(string $label = null)
@@ -1618,6 +1641,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection ziti_pay_temp(string $label = null)
      * @method Grid\Column|Collection dada_number(string $label = null)
      * @method Grid\Column|Collection is_open_dada(string $label = null)
+     * @method Grid\Column|Collection tel(string $label = null)
      * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection sender(string $label = null)
      * @method Grid\Column|Collection is_email(string $label = null)
@@ -1760,6 +1784,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection sss_shop_token(string $label = null)
      * @method Grid\Column|Collection time4(string $label = null)
      * @method Grid\Column|Collection announcement(string $label = null)
+     * @method Grid\Column|Collection start_at(string $label = null)
+     * @method Grid\Column|Collection freight(string $label = null)
      * @method Grid\Column|Collection yyzz(string $label = null)
      * @method Grid\Column|Collection md_area(string $label = null)
      * @method Grid\Column|Collection md_type(string $label = null)
@@ -1786,7 +1812,9 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection store_mchid(string $label = null)
      * @method Grid\Column|Collection cash_code(string $label = null)
      * @method Grid\Column|Collection store_wallet(string $label = null)
+     * @method Grid\Column|Collection award_money(string $label = null)
      * @method Grid\Column|Collection add_time(string $label = null)
+     * @method Grid\Column|Collection category(string $label = null)
      * @method Grid\Column|Collection xyh_open(string $label = null)
      * @method Grid\Column|Collection is_jd(string $label = null)
      * @method Grid\Column|Collection is_jfpay(string $label = null)
@@ -2249,13 +2277,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection hit(string $label = null)
      * @method Grid\Column|Collection count(string $label = null)
      * @method Grid\Column|Collection ip_count(string $label = null)
-     * @method Grid\Column|Collection full_amount(string $label = null)
-     * @method Grid\Column|Collection discounts(string $label = null)
      * @method Grid\Column|Collection is_new_user(string $label = null)
-     * @method Grid\Column|Collection inventory_use(string $label = null)
-     * @method Grid\Column|Collection storetype_id(string $label = null)
      * @method Grid\Column|Collection active_type(string $label = null)
-     * @method Grid\Column|Collection usable_number(string $label = null)
      * @method Grid\Column|Collection usable_start_time(string $label = null)
      * @method Grid\Column|Collection usable_end_time(string $label = null)
      * @method Grid\Column|Collection add_user_id(string $label = null)
@@ -2374,9 +2397,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection brand_name(string $label = null)
      * @method Grid\Column|Collection success(string $label = null)
      * @method Grid\Column|Collection error(string $label = null)
-	 * @method Grid\Column|Collection qrcode_path(string $label = null)
-     * @method Grid\Column|Collection admin_user_id(string $label = null)
-     * @method Grid\Column|Collection cs_id(string $label = null)
      * @method Grid\Column|Collection market_ids(string $label = null)
      * @method Grid\Column|Collection sub_title(string $label = null)
      * @method Grid\Column|Collection cover(string $label = null)
@@ -2384,8 +2404,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection path_type(string $label = null)
      * @method Grid\Column|Collection bg_color(string $label = null)
      * @method Grid\Column|Collection cover_img(string $label = null)
-     * @method Grid\Column|Collection storetype_ids(string $label = null)
      * @method Grid\Column|Collection activity_available(string $label = null)
+     * @method Grid\Column|Collection tags(string $label = null)
      * @method Grid\Column|Collection person_id(string $label = null)
      * @method Grid\Column|Collection qrcode_path(string $label = null)
      * @method Grid\Column|Collection user_type(string $label = null)
@@ -2396,7 +2416,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection vip_price(string $label = null)
      * @method Grid\Column|Collection is_infinite(string $label = null)
      * @method Grid\Column|Collection goods_unit(string $label = null)
-     * @method Grid\Column|Collection tags(string $label = null)
      * @method Grid\Column|Collection details_imgs(string $label = null)
      * @method Grid\Column|Collection expire_time(string $label = null)
      * @method Grid\Column|Collection time_limit_days(string $label = null)
@@ -2413,6 +2432,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection services_money(string $label = null)
      * @method Grid\Column|Collection coupon_money(string $label = null)
      * @method Grid\Column|Collection delivery_money(string $label = null)
+     * @method Grid\Column|Collection horseman_id(string $label = null)
      * @method Grid\Column|Collection delivery_time_note(string $label = null)
      * @method Grid\Column|Collection total_refund_note(string $label = null)
      * @method Grid\Column|Collection c_attitude(string $label = null)
@@ -2433,14 +2453,11 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection join_ip(string $label = null)
      * @method Grid\Column|Collection last_visit_time(string $label = null)
      * @method Grid\Column|Collection last_ip(string $label = null)
-     * @method Grid\Column|Collection store_users_id(string $label = null)
-     * @method Grid\Column|Collection apply_time(string $label = null)
+     * @method Grid\Column|Collection trade_no(string $label = null)
      * @method Grid\Column|Collection check_time(string $label = null)
      * @method Grid\Column|Collection apply_cash(string $label = null)
      * @method Grid\Column|Collection real_cash(string $label = null)
      * @method Grid\Column|Collection bank_info(string $label = null)
-     * @method Grid\Column|Collection store_type_id(string $label = null)
-     * @method Grid\Column|Collection goods_type_id(string $label = null)
      * @method Grid\Column|Collection nick_name(string $label = null)
      * @method Grid\Column|Collection real_name(string $label = null)
      * @method Grid\Column|Collection doorplate(string $label = null)
@@ -2489,12 +2506,13 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection loudspeaker_imei
      * @property Show\Field|Collection dishes_menu_intro
      * @property Show\Field|Collection create_time
-     * @property Show\Field|Collection tel
+     * @property Show\Field|Collection logo_url
+     * @property Show\Field|Collection mm_user_id
+     * @property Show\Field|Collection store_applet_img
+     * @property Show\Field|Collection cash_code_img
      * @property Show\Field|Collection is_rest
-     * @property Show\Field|Collection award_money
-     * @property Show\Field|Collection img
-     * @property Show\Field|Collection start_at
-     * @property Show\Field|Collection freight
+     * @property Show\Field|Collection is_open
+     * @property Show\Field|Collection width
      * @property Show\Field|Collection money
      * @property Show\Field|Collection mp_id
      * @property Show\Field|Collection is_pay
@@ -2507,20 +2525,35 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection activity
      * @property Show\Field|Collection forward
      * @property Show\Field|Collection repay
-     * @property Show\Field|Collection category
+     * @property Show\Field|Collection category_text
      * @property Show\Field|Collection value
+     * @property Show\Field|Collection start_time_text
+     * @property Show\Field|Collection end_time_text
+     * @property Show\Field|Collection full_amount
+     * @property Show\Field|Collection discounts
+     * @property Show\Field|Collection discount_type_text
+     * @property Show\Field|Collection inventory
+     * @property Show\Field|Collection inventory_use
+     * @property Show\Field|Collection use_number
+     * @property Show\Field|Collection active_type_text
+     * @property Show\Field|Collection usable_start_time_text
+     * @property Show\Field|Collection usable_end_time_text
+     * @property Show\Field|Collection receive_type_text
+     * @property Show\Field|Collection type_text
+     * @property Show\Field|Collection storetype_id
+     * @property Show\Field|Collection is_new_user_text
+     * @property Show\Field|Collection usable_number
+     * @property Show\Field|Collection weigh
+     * @property Show\Field|Collection status_text
+     * @property Show\Field|Collection created_at_text
+     * @property Show\Field|Collection updated_at_text
      * @property Show\Field|Collection store_id
      * @property Show\Field|Collection store_name
      * @property Show\Field|Collection new_user_total
-     * @property Show\Field|Collection mm_user_id
-     * @property Show\Field|Collection logo_url
-     * @property Show\Field|Collection store_applet_img
-     * @property Show\Field|Collection cash_code_img
-     * @property Show\Field|Collection is_open
-     * @property Show\Field|Collection width
      * @property Show\Field|Collection cover_img_url
-     * @property Show\Field|Collection category_id
      * @property Show\Field|Collection price
+     * @property Show\Field|Collection category_id
+     * @property Show\Field|Collection goods_category_id
      * @property Show\Field|Collection on_sale
      * @property Show\Field|Collection parent_id
      * @property Show\Field|Collection order
@@ -2580,7 +2613,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection group_id
      * @property Show\Field|Collection condition
      * @property Show\Field|Collection ismenu
-     * @property Show\Field|Collection weigh
      * @property Show\Field|Collection flag
      * @property Show\Field|Collection image
      * @property Show\Field|Collection keywords
@@ -2703,6 +2735,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection item
      * @property Show\Field|Collection area_name
      * @property Show\Field|Collection num
+     * @property Show\Field|Collection img
      * @property Show\Field|Collection stars
      * @property Show\Field|Collection time
      * @property Show\Field|Collection order_id
@@ -2771,7 +2804,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection vip_money
      * @property Show\Field|Collection dn_money
      * @property Show\Field|Collection is_show
-     * @property Show\Field|Collection inventory
      * @property Show\Field|Collection sales
      * @property Show\Field|Collection is_gg
      * @property Show\Field|Collection is_hot
@@ -2783,7 +2815,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection start_num
      * @property Show\Field|Collection dn_hymoney
      * @property Show\Field|Collection is_max
-     * @property Show\Field|Collection goods_unit
+     * @property Show\Field|Collection good_unit
      * @property Show\Field|Collection goods_id
      * @property Show\Field|Collection goods_logo
      * @property Show\Field|Collection goods_name
@@ -2841,6 +2873,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection ziti_pay_temp
      * @property Show\Field|Collection dada_number
      * @property Show\Field|Collection is_open_dada
+     * @property Show\Field|Collection tel
      * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection sender
      * @property Show\Field|Collection is_email
@@ -2983,6 +3016,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection sss_shop_token
      * @property Show\Field|Collection time4
      * @property Show\Field|Collection announcement
+     * @property Show\Field|Collection start_at
+     * @property Show\Field|Collection freight
      * @property Show\Field|Collection yyzz
      * @property Show\Field|Collection md_area
      * @property Show\Field|Collection md_type
@@ -3009,7 +3044,9 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection store_mchid
      * @property Show\Field|Collection cash_code
      * @property Show\Field|Collection store_wallet
+     * @property Show\Field|Collection award_money
      * @property Show\Field|Collection add_time
+     * @property Show\Field|Collection category
      * @property Show\Field|Collection xyh_open
      * @property Show\Field|Collection is_jd
      * @property Show\Field|Collection is_jfpay
@@ -3472,13 +3509,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection hit
      * @property Show\Field|Collection count
      * @property Show\Field|Collection ip_count
-     * @property Show\Field|Collection full_amount
-     * @property Show\Field|Collection discounts
      * @property Show\Field|Collection is_new_user
-     * @property Show\Field|Collection inventory_use
-     * @property Show\Field|Collection storetype_id
      * @property Show\Field|Collection active_type
-     * @property Show\Field|Collection usable_number
      * @property Show\Field|Collection usable_start_time
      * @property Show\Field|Collection usable_end_time
      * @property Show\Field|Collection add_user_id
@@ -3597,9 +3629,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection brand_name
      * @property Show\Field|Collection success
      * @property Show\Field|Collection error
- 	 * @property Show\Field|Collection qrcode_path
-     * @property Show\Field|Collection admin_user_id
-     * @property Show\Field|Collection cs_id
      * @property Show\Field|Collection market_ids
      * @property Show\Field|Collection sub_title
      * @property Show\Field|Collection cover
@@ -3607,8 +3636,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection path_type
      * @property Show\Field|Collection bg_color
      * @property Show\Field|Collection cover_img
-     * @property Show\Field|Collection storetype_ids
      * @property Show\Field|Collection activity_available
+     * @property Show\Field|Collection tags
      * @property Show\Field|Collection person_id
      * @property Show\Field|Collection qrcode_path
      * @property Show\Field|Collection user_type
@@ -3619,7 +3648,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection vip_price
      * @property Show\Field|Collection is_infinite
      * @property Show\Field|Collection goods_unit
-     * @property Show\Field|Collection tags
      * @property Show\Field|Collection details_imgs
      * @property Show\Field|Collection expire_time
      * @property Show\Field|Collection time_limit_days
@@ -3636,6 +3664,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection services_money
      * @property Show\Field|Collection coupon_money
      * @property Show\Field|Collection delivery_money
+     * @property Show\Field|Collection horseman_id
      * @property Show\Field|Collection delivery_time_note
      * @property Show\Field|Collection total_refund_note
      * @property Show\Field|Collection c_attitude
@@ -3656,14 +3685,11 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection join_ip
      * @property Show\Field|Collection last_visit_time
      * @property Show\Field|Collection last_ip
-     * @property Show\Field|Collection store_users_id
-     * @property Show\Field|Collection apply_time
+     * @property Show\Field|Collection trade_no
      * @property Show\Field|Collection check_time
      * @property Show\Field|Collection apply_cash
      * @property Show\Field|Collection real_cash
      * @property Show\Field|Collection bank_info
-     * @property Show\Field|Collection store_type_id
-     * @property Show\Field|Collection goods_type_id
      * @property Show\Field|Collection nick_name
      * @property Show\Field|Collection real_name
      * @property Show\Field|Collection doorplate
@@ -3707,12 +3733,13 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection loudspeaker_imei(string $label = null)
      * @method Show\Field|Collection dishes_menu_intro(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
-     * @method Show\Field|Collection tel(string $label = null)
+     * @method Show\Field|Collection logo_url(string $label = null)
+     * @method Show\Field|Collection mm_user_id(string $label = null)
+     * @method Show\Field|Collection store_applet_img(string $label = null)
+     * @method Show\Field|Collection cash_code_img(string $label = null)
      * @method Show\Field|Collection is_rest(string $label = null)
-     * @method Show\Field|Collection award_money(string $label = null)
-     * @method Show\Field|Collection img(string $label = null)
-     * @method Show\Field|Collection start_at(string $label = null)
-     * @method Show\Field|Collection freight(string $label = null)
+     * @method Show\Field|Collection is_open(string $label = null)
+     * @method Show\Field|Collection width(string $label = null)
      * @method Show\Field|Collection money(string $label = null)
      * @method Show\Field|Collection mp_id(string $label = null)
      * @method Show\Field|Collection is_pay(string $label = null)
@@ -3725,20 +3752,35 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection activity(string $label = null)
      * @method Show\Field|Collection forward(string $label = null)
      * @method Show\Field|Collection repay(string $label = null)
-     * @method Show\Field|Collection category(string $label = null)
+     * @method Show\Field|Collection category_text(string $label = null)
      * @method Show\Field|Collection value(string $label = null)
+     * @method Show\Field|Collection start_time_text(string $label = null)
+     * @method Show\Field|Collection end_time_text(string $label = null)
+     * @method Show\Field|Collection full_amount(string $label = null)
+     * @method Show\Field|Collection discounts(string $label = null)
+     * @method Show\Field|Collection discount_type_text(string $label = null)
+     * @method Show\Field|Collection inventory(string $label = null)
+     * @method Show\Field|Collection inventory_use(string $label = null)
+     * @method Show\Field|Collection use_number(string $label = null)
+     * @method Show\Field|Collection active_type_text(string $label = null)
+     * @method Show\Field|Collection usable_start_time_text(string $label = null)
+     * @method Show\Field|Collection usable_end_time_text(string $label = null)
+     * @method Show\Field|Collection receive_type_text(string $label = null)
+     * @method Show\Field|Collection type_text(string $label = null)
+     * @method Show\Field|Collection storetype_id(string $label = null)
+     * @method Show\Field|Collection is_new_user_text(string $label = null)
+     * @method Show\Field|Collection usable_number(string $label = null)
+     * @method Show\Field|Collection weigh(string $label = null)
+     * @method Show\Field|Collection status_text(string $label = null)
+     * @method Show\Field|Collection created_at_text(string $label = null)
+     * @method Show\Field|Collection updated_at_text(string $label = null)
      * @method Show\Field|Collection store_id(string $label = null)
      * @method Show\Field|Collection store_name(string $label = null)
      * @method Show\Field|Collection new_user_total(string $label = null)
-     * @method Show\Field|Collection mm_user_id(string $label = null)
-     * @method Show\Field|Collection logo_url(string $label = null)
-     * @method Show\Field|Collection store_applet_img(string $label = null)
-     * @method Show\Field|Collection cash_code_img(string $label = null)
-     * @method Show\Field|Collection is_open(string $label = null)
-     * @method Show\Field|Collection width(string $label = null)
      * @method Show\Field|Collection cover_img_url(string $label = null)
-     * @method Show\Field|Collection category_id(string $label = null)
      * @method Show\Field|Collection price(string $label = null)
+     * @method Show\Field|Collection category_id(string $label = null)
+     * @method Show\Field|Collection goods_category_id(string $label = null)
      * @method Show\Field|Collection on_sale(string $label = null)
      * @method Show\Field|Collection parent_id(string $label = null)
      * @method Show\Field|Collection order(string $label = null)
@@ -3798,7 +3840,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection group_id(string $label = null)
      * @method Show\Field|Collection condition(string $label = null)
      * @method Show\Field|Collection ismenu(string $label = null)
-     * @method Show\Field|Collection weigh(string $label = null)
      * @method Show\Field|Collection flag(string $label = null)
      * @method Show\Field|Collection image(string $label = null)
      * @method Show\Field|Collection keywords(string $label = null)
@@ -3921,6 +3962,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection item(string $label = null)
      * @method Show\Field|Collection area_name(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
+     * @method Show\Field|Collection img(string $label = null)
      * @method Show\Field|Collection stars(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection order_id(string $label = null)
@@ -3989,7 +4031,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection vip_money(string $label = null)
      * @method Show\Field|Collection dn_money(string $label = null)
      * @method Show\Field|Collection is_show(string $label = null)
-     * @method Show\Field|Collection inventory(string $label = null)
      * @method Show\Field|Collection sales(string $label = null)
      * @method Show\Field|Collection is_gg(string $label = null)
      * @method Show\Field|Collection is_hot(string $label = null)
@@ -4001,7 +4042,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection start_num(string $label = null)
      * @method Show\Field|Collection dn_hymoney(string $label = null)
      * @method Show\Field|Collection is_max(string $label = null)
-     * @method Show\Field|Collection goods_unit(string $label = null)
+     * @method Show\Field|Collection good_unit(string $label = null)
      * @method Show\Field|Collection goods_id(string $label = null)
      * @method Show\Field|Collection goods_logo(string $label = null)
      * @method Show\Field|Collection goods_name(string $label = null)
@@ -4059,6 +4100,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection ziti_pay_temp(string $label = null)
      * @method Show\Field|Collection dada_number(string $label = null)
      * @method Show\Field|Collection is_open_dada(string $label = null)
+     * @method Show\Field|Collection tel(string $label = null)
      * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection sender(string $label = null)
      * @method Show\Field|Collection is_email(string $label = null)
@@ -4201,6 +4243,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection sss_shop_token(string $label = null)
      * @method Show\Field|Collection time4(string $label = null)
      * @method Show\Field|Collection announcement(string $label = null)
+     * @method Show\Field|Collection start_at(string $label = null)
+     * @method Show\Field|Collection freight(string $label = null)
      * @method Show\Field|Collection yyzz(string $label = null)
      * @method Show\Field|Collection md_area(string $label = null)
      * @method Show\Field|Collection md_type(string $label = null)
@@ -4227,7 +4271,9 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection store_mchid(string $label = null)
      * @method Show\Field|Collection cash_code(string $label = null)
      * @method Show\Field|Collection store_wallet(string $label = null)
+     * @method Show\Field|Collection award_money(string $label = null)
      * @method Show\Field|Collection add_time(string $label = null)
+     * @method Show\Field|Collection category(string $label = null)
      * @method Show\Field|Collection xyh_open(string $label = null)
      * @method Show\Field|Collection is_jd(string $label = null)
      * @method Show\Field|Collection is_jfpay(string $label = null)
@@ -4690,13 +4736,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection hit(string $label = null)
      * @method Show\Field|Collection count(string $label = null)
      * @method Show\Field|Collection ip_count(string $label = null)
-     * @method Show\Field|Collection full_amount(string $label = null)
-     * @method Show\Field|Collection discounts(string $label = null)
      * @method Show\Field|Collection is_new_user(string $label = null)
-     * @method Show\Field|Collection inventory_use(string $label = null)
-     * @method Show\Field|Collection storetype_id(string $label = null)
      * @method Show\Field|Collection active_type(string $label = null)
-     * @method Show\Field|Collection usable_number(string $label = null)
      * @method Show\Field|Collection usable_start_time(string $label = null)
      * @method Show\Field|Collection usable_end_time(string $label = null)
      * @method Show\Field|Collection add_user_id(string $label = null)
@@ -4815,9 +4856,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection brand_name(string $label = null)
      * @method Show\Field|Collection success(string $label = null)
      * @method Show\Field|Collection error(string $label = null)
- 	 * @method Show\Field|Collection qrcode_path(string $label = null)
-     * @method Show\Field|Collection admin_user_id(string $label = null)
-     * @method Show\Field|Collection cs_id(string $label = null)
      * @method Show\Field|Collection market_ids(string $label = null)
      * @method Show\Field|Collection sub_title(string $label = null)
      * @method Show\Field|Collection cover(string $label = null)
@@ -4825,8 +4863,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection path_type(string $label = null)
      * @method Show\Field|Collection bg_color(string $label = null)
      * @method Show\Field|Collection cover_img(string $label = null)
-     * @method Show\Field|Collection storetype_ids(string $label = null)
      * @method Show\Field|Collection activity_available(string $label = null)
+     * @method Show\Field|Collection tags(string $label = null)
      * @method Show\Field|Collection person_id(string $label = null)
      * @method Show\Field|Collection qrcode_path(string $label = null)
      * @method Show\Field|Collection user_type(string $label = null)
@@ -4837,7 +4875,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection vip_price(string $label = null)
      * @method Show\Field|Collection is_infinite(string $label = null)
      * @method Show\Field|Collection goods_unit(string $label = null)
-     * @method Show\Field|Collection tags(string $label = null)
      * @method Show\Field|Collection details_imgs(string $label = null)
      * @method Show\Field|Collection expire_time(string $label = null)
      * @method Show\Field|Collection time_limit_days(string $label = null)
@@ -4854,6 +4891,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection services_money(string $label = null)
      * @method Show\Field|Collection coupon_money(string $label = null)
      * @method Show\Field|Collection delivery_money(string $label = null)
+     * @method Show\Field|Collection horseman_id(string $label = null)
      * @method Show\Field|Collection delivery_time_note(string $label = null)
      * @method Show\Field|Collection total_refund_note(string $label = null)
      * @method Show\Field|Collection c_attitude(string $label = null)
@@ -4874,14 +4912,11 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection join_ip(string $label = null)
      * @method Show\Field|Collection last_visit_time(string $label = null)
      * @method Show\Field|Collection last_ip(string $label = null)
-     * @method Show\Field|Collection store_users_id(string $label = null)
-     * @method Show\Field|Collection apply_time(string $label = null)
+     * @method Show\Field|Collection trade_no(string $label = null)
      * @method Show\Field|Collection check_time(string $label = null)
      * @method Show\Field|Collection apply_cash(string $label = null)
      * @method Show\Field|Collection real_cash(string $label = null)
      * @method Show\Field|Collection bank_info(string $label = null)
-     * @method Show\Field|Collection store_type_id(string $label = null)
-     * @method Show\Field|Collection goods_type_id(string $label = null)
      * @method Show\Field|Collection nick_name(string $label = null)
      * @method Show\Field|Collection real_name(string $label = null)
      * @method Show\Field|Collection doorplate(string $label = null)

resources/lang/zh-CN/system-config.php

@@ -0,0 +1,21 @@
+<?php 
+return [
+    'labels' => [
+        'SystemConfig' => '平台配置',
+        'systemConfig' => '平台配置',
+        'system_config' => '平台配置',
+    ],
+    'fields' => [
+        'menu_name' => '字段名称',
+        'category' => '分类',
+        'category_text' => '分类',
+        'value' => '配置值',
+        'info' => '配置名称',
+        'desc' => '配置简介',
+        'sort' => '排序',
+        'status' => '状态',
+        'status_text' => '状态'
+    ],
+    'options' => [
+    ],
+];