Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

# Conflicts: # vue.config.js
提交代码
2024-03-23 22:35:37 +08:00 · 2024-03-23 22:34:39 +08:00
1 changed files with 1548 additions and 1423 deletions
--- a/src/pages/projectVideo.vue
+++ b/src/pages/projectVideo.vue
Author	SHA1	Message	Date
姜玉琦	61c3dda21e	Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev # Conflicts: # vue.config.js	2024-03-23 22:35:37 +08:00
姜玉琦	7f800e5ec8	提交代码	2024-03-23 22:34:39 +08:00