韦荣超 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

..

assets

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

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

drawio @ d1e210ce4b

no message

2022-02-22 14:24:27 +08:00

lang/en

no message

2021-05-30 23:22:12 +08:00

views

fix: 修复客户端旧版本更新任务出现已完成列表中有状态为“进行中”的情况

2022-01-13 11:48:33 +08:00