Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

# Conflicts:
#	package-lock.json
#	yarn.lock

src/pages/Payment/FPS/FPS.js

@@ -230,10 +230,11 @@ const Index = () => {
                                         請掃描以下二維碼
                                         <br />
                                         <img src={fpsqrcodeimgbase64} alt="QR Code"/>
+                                        <img src={fpsqrcodeurl} alt="QR Code"/>
                                         <br />
                                         二維碼有效期限10分鐘
                                         <br />
-                                        請在規定時間內完成付款流程
+                                        請在規定時間內完成付款流程 ({fpsmerchanttimeoutdatetime})
                                     </Typography>
 
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>

src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js

@@ -20,7 +20,7 @@ import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 const BaseGrid = Loadable(lazy(() => import('./BaseGrid')));
 const StatusHistoryTab = Loadable(lazy(() => import('./StatusHistoryTab')));
-const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent')));
+const LoadingComponent = Loadable(lazy(() => import('../../../extra-pages/LoadingComponent')));
 const ProofTab = Loadable(lazy(() => import('./ProofTab')));
 
 

src/routes/GLDUserRoutes.js

@@ -6,7 +6,7 @@ import Loadable from 'components/Loadable';
 const MainLayout = Loadable(lazy(() => import('layout/MainLayout')));
 
 // render - dashboard
-const DashboardDefault = Loadable(lazy(() => import('pages/dashboard/GLD')));
+const DashboardDefault = Loadable(lazy(() => import('pages/Dashboard/GLD')));
 const ApplicationDetail = Loadable(lazy(() => import('pages/PublicNotice/Details_GLD')));
 const ApplicationSearch = Loadable(lazy(() => import('pages/PublicNotice/Search_GLD')));
 const ProofSearch = Loadable(lazy(() => import('pages/Proof/Search_GLD')));

src/routes/PublicUserRoutes.js

@@ -6,7 +6,7 @@ import Loadable from 'components/Loadable';
 const MainLayout = Loadable(lazy(() => import('layout/MainLayout')));
 
 // render - dashboard
-const DashboardDefault = Loadable(lazy(() => import('pages/dashboard/Public')));
+const DashboardDefault = Loadable(lazy(() => import('pages/Dashboard/Public')));
 const ManageOrgUser = Loadable(lazy(() => import('pages/User/ManagePage_OrgPublic')));
 const PublicNotice = Loadable(lazy(() => import('pages/PublicNotice/ListPanel')));
 const PublicNoticeApplyForm = Loadable(lazy(() => import('pages/PublicNotice/ApplyForm')));