Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -467,6 +467,7 @@ class Workquestionandanswer extends Component {
                         <span>
                        <div className="font-16 color-dark   break_word flex1 pl20  "  style={{"padding":"10px 10px 10px 20px"}}>
                        {jobsettingsdata === undefined ? "" : jobsettingsdata === null ? "" : jobsettingsdata === "null" ? "" :
+                         jobsettingsdata.data.explanation=== undefined?"" :jobsettingsdata.data.explanation=== null?"":
                          <div dangerouslySetInnerHTML={{__html:markdownToHTML(jobsettingsdata.data.explanation).replace(/▁/g,"▁▁▁")}}></div>
                        }
                         </div>

public/react/src/modules/tpm/NewHeader.js

@@ -173,8 +173,8 @@ class NewHeader extends Component {
       user_phone_binded:false,
       showTrial:false,
     }
-    console.log("176")
-    console.log(props);
+    // console.log("176")
+    // console.log(props);
   }
 
   componentDidMount() {