xiaochong0302 387503c218 Merge branch 'develop' into demo ...

# Conflicts:
#	app/Http/Admin/Controllers/SettingController.php
#	app/Http/Admin/Services/Setting.php
#	db/migrations/20200827112717_insert_setting_data.php

2020-09-07 10:26:21 +08:00

..

Controllers

Merge branch 'develop' into demo

2020-09-07 10:26:21 +08:00

Services

Merge branch 'develop' into demo

2020-09-07 10:26:21 +08:00

Views

整理清除数据万象后的调整

2020-09-06 20:11:51 +08:00

Module.php

1.重写view provider,数组赋值自动转对象

2020-04-25 18:36:32 +08:00