Merge branch 'dev' into dev_fix_sub

peng

2025-07-17 c034d4cdaf348594c443b4acd5f4c3b166e4d420

 pages/video/video-edit.vue

@@ -206,7 +206,7 @@

<script>
import '@/components/uview-components/uview-ui';
import MyTag from '@/components/my-tag.vue'
import MyTag from '@/pages/subComponents/my-tag.vue'

import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
import { updateVideo, getVideoDetail } from "@/api/video.js";