Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx

@@ -170,8 +170,7 @@ const SupplierAnnualStatistics: React.FC = () => {
       title: intl.formatMessage({ id: 'dataStatistics.annual.annualStatisticsResult' }),
       dataIndex: 'annualStatisticsResult',
       key: 'annualStatisticsResult',
-      width: 100,
+      width: 100
-      render: (result: string) => getResultTag(result),
     },
   ];
 

src/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics.tsx

@@ -170,8 +170,8 @@ const SupplierQualificationWarningStatistics: React.FC = () => {
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.qualification.qualificationName' }),
-      dataIndex: 'qualificationName',
+      dataIndex: 'qualificationsName',
-      key: 'qualificationName',
+      key: 'qualificationsName',
       width: 150,
       ellipsis: {
         showTitle: false,