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: 60d6d183bfe6944e4a5f9362f6c57cf950cfe2a0
+  newTag: e75e4beb54565652e5c723d0d12010b1af83072b

src/components/order/selfTableItem/index.tsx

 import './index.scss';
+import React from 'react';
 const TableItem: React.FC<{
   td?: React.ReactNode;
   tr?: React.ReactNode;

src/pages/common/login/index.tsx

@@ -80,7 +80,7 @@ function LoginView() {
       }, 1000);
     } else {
       if (time) {
-        clearInterval(time);
+        clearInterval(time as any);
       }
     }
     setIsLoginCode(!isLoginCode);
@@ -89,7 +89,7 @@ function LoginView() {
   const getLoginInfo = () => {
     CommonAPI.getLoginInfo({ randomLoginCode }).then(async ({ result, code }) => {
       if (code === '200') {
-        clearInterval(time);
+        clearInterval(time as any);
         message.success('登录成功');
         const { token } = result;
         await Cookies.set('SHAREFLY-TOKEN', token);

src/pages/orderManage/demandOrder/orderList/index.tsx

@@ -79,6 +79,11 @@ const DemandOrderList = () => {
   };
   // 组件挂载
   useEffect(() => {
+    // 还原列表
+    setTableData([]);
+    // 还原分页
+    setPagination({ pageNo: 1, pageSize: 10, totalCount: 0 });
+    // 获取数据
     getFlowDictionary().then();
     getServiceOrderFormList();
     // console.log('组件挂载 --->', );