合并分支。解决冲突
commit c2306c17b693234c40afc66f7f8ffbc5684b0a97
2 parents d0ed762 + 4f35cf5
dutingting authored on 17 Feb
Showing 11 changed files
View
public/playerVideo6/.gitattributes 0 → 100644
View
public/playerVideo6/README.md 0 → 100644
View
public/playerVideo6/bg.jpg 0 → 100644
View
public/playerVideo6/decoder.js 0 → 100644
View
public/playerVideo6/decoder.wasm 0 → 100644
Not supported
View
public/playerVideo6/jessibuca.d.ts 0 → 100644
View
public/playerVideo6/jessibuca.js 0 → 100644
View
public/playerVideo6/player.html 0 → 100644
View
src/views/bigScreen/components/video6.vue
View
src/views/bigScreen/index.vue
View
src/views/system/bsConfig/index.vue