Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 844991e98918f9ed83492768dbe0044982901e46
+  newTag: 3a4eeb836d901a880a18bb622d93340ea34ef01e

src/pages/customManage/customIdentity/index.tsx

@@ -131,6 +131,7 @@ const CustomIdentityView = () => {
   };
 
   useEffect(() => {
+    query = {};
     getCooperationList().then();
     getTableList().then();
     getListAppUserCount();

src/router/router.tsx

@@ -173,7 +173,7 @@ import CompanyMemberView from '~/pages/systemManage/companyManage/companyMember'
 import CourseCategoryView from '~/pages/pilotTraining/courseCategory';
 import NoticeManageView from '~/pages/resourceManage/noticeManage';
 import CustomApplyPage from '~/pages/customManage/customApply';
-import StoreDecoratePage from 'src/pages/resourceManage/storeDecorate';
+import StoreDecoratePage from '~/pages/resourceManage/storeDecorate';
 const AddressManageView = React.lazy(() => import('~/pages/systemManage/addressManage'));
 
 // const IndustryListView = React.lazy(() => import('~/pages/mallManage/industryManage/industryList')); //行业列表
@@ -206,7 +206,7 @@ export interface RouteObjectType {
   };
 }
 // 加载页面
-const withLoadingComponent = (comp: JSX.Element) => (
+const withLoadingComponent = (comp: React.ReactNode) => (
   <React.Suspense
     fallback={
       <Spin size='large' tip='Loading...'>