冲突

src/business/trnrel/event/index.js

@@ -147,15 +147,9 @@ export default {
         query: { trn: row['inr'], operateId: operateId,newFlag:row.inifrm.toLowerCase()},
         params: { prePageId: this.model.pageId },
       });
-<<<<<<< HEAD
       localStorage.setItem(`review_${row.inifrm.toLowerCase()}`, JSON.stringify(row))
       //进入复核之后，给该交易的交易码设置flag，用来判断是否存在该交易码的复核页面
       localStorage.setItem(`flag_${row.inifrm.toLowerCase()}`,true)
-=======
-      sessionStorage.setItem(`review_${row.inr}`, JSON.stringify(row))
-
-
->>>>>>> 74d3c3b4b8b5f632d1073438d2970a0055c87fec
     },
     async onRelrow(idx) {
       this.$confirm('您确定复核该笔交易?', '提示', {