Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/api/index.js

@@ -190,7 +190,7 @@ const create = (type = "") => {
   const getParentItemReport = (body) => api.post('item_report/get_parent_item_report_default', body)
   const saveMasterDataCat = (body) => api.post('item_report_company/create_item_report_company', body)
   const getDetailMasterDataCat = (idCompany, years) => api.get(`item_report_company/get_item_report_company_by_companyid_years/${idCompany}/${years}`)
-  const deleteMasterDataCat = (idCompany, years) => api.post(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
+  const deleteMasterDataCat = (idCompany, years) => api.get(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
 
   //Transaction
   const getReportTypeBody = (body) => api.post('transaction/master_budget/get_all_report', body)

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -610,7 +610,7 @@ export default class MasterDataCAT extends Component {
                                 item.weight, 
                                 item.years,
                                 item.status,
-                                item.item_report_company_id
+                                item.company_id
                             ]
                         })
                         this.setState({ dataTable: listData, listData: response.data.data }, () => {