Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/App.js

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import './public-path';
 import logo from './logo.svg';
 import './App.css';
-import {LocaleProvider} from 'antd'
+import {ConfigProvider} from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
 	BrowserRouter as Router,
@@ -483,7 +483,7 @@ class App extends Component {
 		// console.log(mygetHelmetapi);
 		return (
 			<Provider store={store}>
-				<LocaleProvider locale={zhCN}>
+				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<Accountnewprofile {...this.props}{...this.state}/>
 						<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
@@ -708,7 +708,7 @@ class App extends Component {
 							</Switch>
 						</Router>
 					</MuiThemeProvider>
-				</LocaleProvider>						 
+				</ConfigProvider>
 			</Provider>
 		);
 	}