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

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

@@ -20,7 +20,7 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-import TPMsettings from './TPMsettings/TPMsettings';
+import TPMsettings from './TPMsettings/oldTPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -4,7 +4,7 @@ import {TPMIndexHOC} from '../TPMIndexHOC';
 
 import {SnackbarHOC} from 'educoder';
 
-import {Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon} from 'antd';
+import {Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon,notification} from 'antd';
 
 import axios from 'axios';