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

src/views/ecw/banner/index.vue

@@ -101,7 +101,7 @@
         <el-form-item :label="$t('英文内容')" prop="contentEn">
           <editor v-model="form.contentEn" :min-height="150"/>
         </el-form-item>
-        <el-form-item :label="$t('WEB端广告图片（建议尺寸')+'210*902）'" prop="bannerUrlWeb">
+        <el-form-item :label="$t('WEB端广告图片（建议尺寸长*宽')+'902*310）'" prop="bannerUrlWeb">
           <el-col :span="8">
             <el-input v-model="form.bannerUrlWeb" :placeholder="$t('请上传WEB端广告图片')" />
           </el-col>
@@ -113,7 +113,7 @@
             </el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item :label="$t('APP端广告图片（建议尺寸')+'688*294）'" prop="bannerUrlApp">
+        <el-form-item :label="$t('APP端广告图片（建议尺寸长*宽')+'688*294）'" prop="bannerUrlApp">
           <el-col :span="8">
             <el-input v-model="form.bannerUrlApp" :placeholder="$t('请上传APP端广告图片')" />
           </el-col>