Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/platform/examination/question/edit.vue

@@ -269,7 +269,11 @@
             :rows="1"
             :autosize="readonly"
             :disabled="readonly"
-            placeholder="请输入答案内容，最多可配置20个答案"
+            :placeholder="
+              estimate && questionRateType === '自动'
+                ? `请输入答案内容，最多可配置1个答案；请用英文逗号（,）连接`
+                : '请输入答案内容，最多可配置20个答案'
+            "
           />
           <div v-if="!readonly" class="operate-btn">
             <el-button