Commit Graph

12 Commits

Author SHA1 Message Date
a0049873 f392764b0a 接口 2022-06-14 17:41:24 +08:00
a0049873 69e71e841a Merge branch 'hi-ucs-xha' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-xha
# Conflicts:
#	front/src/api/file.js
#	front/src/views/home/DetailsPageconetent.vue
2022-06-14 17:38:11 +08:00
a0049873 0cfb08788a 数据资源 2022-06-14 17:33:31 +08:00
wuhongjian 05be0ae3fb 视频对接 2022-06-14 17:32:23 +08:00
wuhongjian 0ba396e9d3 西海岸视频平台对接 2022-06-14 17:08:20 +08:00
gaoyuanwei 7e1eaa8410 Merge branch 'hi-ucs-xha' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-xha 2022-06-14 16:28:34 +08:00
gaoyuanwei 22e395109f 656565 2022-06-14 16:28:12 +08:00
wuhongjian 90163aa9e3 西海岸需求更新 2022-06-14 11:06:22 +08:00
wuhongjian fdb6c28f3c 西海岸bug修复 2022-06-14 10:48:19 +08:00
wuhongjian 6260158c16 西海岸 2022-06-14 09:48:07 +08:00
wuhongjian afbf59cc50 初始化 2022-06-14 09:32:49 +08:00
wuhongjian f41e2c1f3e first commit 2022-06-14 09:29:02 +08:00