merge develop

src/pages/PurchaseAdmin/PurchaseList/Approval/Auth.js

@@ -73,7 +73,7 @@ function Auth(props) {
     */
     {
       title: '流程',
-      dataIndex: 'FlowInfo.name',
+      dataIndex: ['FlowInfo', 'name'],
     },
     {
       title: '状态',

src/pages/PurchaseAdmin/PurchaseList/Approval/List.js

@@ -89,7 +89,7 @@ function List(props) {
     */
     {
       title: '流程',
-      dataIndex: 'FlowInfo.name',
+      dataIndex: ['FlowInfo', 'name'],
     },
     {
       title: '状态',

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/AuthWorkList.js

@@ -30,11 +30,7 @@ function AuthWorkList(props) {
     },
     {
       title: '提交人',
-      dataIndex: 'User.CName',
-      // render: (project_id, item) => {
-      //   if (item.zIndex === 0) return '';
-      //   return project.find(p => p.ID == project_id)?.Name || '-';
-      // },
+      dataIndex: ['User', 'CName'],
     },
     {
       title: '审核状态',