Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

2 years ago · 0a7b5409f0
parent 41645431ca 644c645a72
commit 0a7b5409f0
2 changed files with 2 additions and 2 deletions
--- a/flossom-ui/src/views/system/siteCarouselInfo/index.vue
+++ b/flossom-ui/src/views/system/siteCarouselInfo/index.vue
@ -389,7 +389,7 @@
              <el-input v-model="form.videoNo" placeholder="请输入视频号ID" />
            </el-form-item>
          </el-col>
-          <el-col :span="24"  v-if="form.type == 5" label-width="90px">
+          <el-col :span="24"  v-if="form.type == 5 || form.type == 6" label-width="90px">
            <el-form-item label="feedId" prop="feedId">
              <el-input v-model="form.feedId"  placeholder="请输入视频号feedId" />
            </el-form-item>
--- a/flossom-ui/src/views/system/siteInfo/index.vue
+++ b/flossom-ui/src/views/system/siteInfo/index.vue
@ -389,7 +389,7 @@
              <el-input v-model="form.videoNo" placeholder="请输入视频号ID" />
            </el-form-item>
          </el-col>
-          <el-col :span="24"  v-if="form.type == 5" label-width="90px">
+          <el-col :span="24"  v-if="form.type == 5 || form.type == 6" label-width="90px">
            <el-form-item label="feedId" prop="feedId">
              <el-input v-model="form.feedId"  placeholder="请输入视频号feedId" />
            </el-form-item>