韦荣超 1117b57101 Merge remote-tracking branch 'origin/dev' into develop ...

# Conflicts:
#	app/Http/Controllers/Api/SystemController.php
#	public/js/language.all.js
#	resources/assets/js/pages/login.vue
#	resources/assets/js/pages/manage.vue
#	resources/assets/js/pages/manage/calendar.vue
#	resources/assets/js/pages/manage/components/Calendar.vue
#	resources/assets/js/pages/manage/setting/system/setting.vue
#	resources/assets/js/store/state.js
#	resources/assets/statics/public/js/language.all.js

2022-02-24 17:18:33 +08:00

..

index.js

Merge remote-tracking branch 'origin/dev' into develop

2022-02-24 17:18:33 +08:00

language.js

语言设置

2021-07-01 13:52:59 +08:00