Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

@@ -29,8 +29,10 @@ const ResultPageFailed = () => {
     <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
       <Result
         status="error"
-        title="Error submit the file!"
-        subTitle={<p>server has been handled it ,please try again or back.</p>}
+        title="Errors occur during uploading!"
+        subTitle={
+          <p>Please download the file to review user information & try to upload again! </p>
+        }
         extra={[
           <Button type="primary" key="ok" onClick={handleDownload}>
             {flag ? (

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -102,7 +102,7 @@ const Users = (props: any) => {
         return false;
       }
       if (
-        file.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+        file.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' &&
         file.type !== 'application/vnd.ms-excel'
       ) {
         message.error(`${file.name}  file format is incorrect!`);