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

zxl

2025-07-02 9d5a1efe45146614157f4b6caefd30ff7cccbb32

 seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -155,7 +155,7 @@
              <div class="goods-video">
                <div v-if="baseInfoForm.goodsVideo">
                  <div>
                    <video :src="baseInfoForm.showGoodsVideo" class="video" controls style="max-width: 300px;"/>
                    <video :src="baseInfoForm.showGoodsVideo" class="video" controls style="max-width: 300px;max-height: 400px"/>
                  </div>
                </div>
                <Upload ref="upload" action="-" :format="['avi', 'wmv', 'mpeg', 'mp4', 'mov']"