Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/poll/PollDetailTabSecond.js

@@ -66,7 +66,7 @@ class PollDetailTabSecond extends Component{
                 <span className="font-16 clearfix">
                   <span className="color-blue fl">{parseInt(page-1)*parseInt(limit)+(key+1)}、{map[item.question.question_type]}</span>
                   { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt6">必答</span>:"" }
-                  { item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ? 
+                  { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
                   <span className="color-grey-9">
                     {
                       item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :

public/react/src/modules/courses/poll/PollDetailTabThird.js

@@ -71,7 +71,7 @@ class PollDetailTabThird extends Component{
                   <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
                     <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
                     { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
-                    { item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ? 
+                    { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
                       <span className="color-grey-9 font-14 fl mt2">
                         {
                           item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :

public/react/src/modules/courses/poll/PollInfo.js

@@ -383,7 +383,7 @@ class PollInfo extends Component{
                       <div className="pl30 pr30 mt30 mb10 clearfix">
                         <span className="color-blue fl font-16">{item.question.question_number}、{map[item.question.question_type]}</span>
                         { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt5">必答</span>:<span className="mustAnswer fl ml10 mr10 mt5">选答</span> }
-                        { item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ? 
+                        { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
                           <span className="color-grey-9 font-14 fl mt2">
                             {
                               item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :