From eff03741b23a46053c0da857705ec06824b23c0d Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 18 May 2022 14:49:46 +0800
Subject: [PATCH] solve conflict

---
 pc4mobx/organization/components/company/company.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 2e1417e..6a631ef 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -36,7 +36,7 @@ import NewAndEditDialog from '../NewAndEditDialog';
 
 const toJS = mobx.toJS;
 const confirm = Modal.confirm;
-//const WeaTable = WeaTableNew.WeaTable;
+//const WeaTable = WeaTableNew.WeaTable
 
 
 @inject('company')