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

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -641,7 +641,7 @@ class CommonWorkList extends Component{
       timeMsg = '申诉剩余时间'
     }
 
-    const hasData = student_works && !!student_works.length && page == 1
+    const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
     
     // console.log(StudentData)
 		// console.log(student_works)

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

@@ -52,7 +52,7 @@ export default class TPMUpdatepropaede extends Component {
     updatepropaedeuticsvalue=()=>{
         let id = this.props.match.params.shixunId;
         let url="/shixuns/"+id+"/update_propaedeutics.json";
-        const update_propaedeuticsvalue = this.editanswersRef.current.getValue().trim();
+        const update_propaedeuticsvalue = this.neweditanswerRef.current.getValue().trim();
         axios.post(url,{
                 content:update_propaedeuticsvalue
             }