liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solve conflict

This commit is contained in:
Chengliang 2022-05-18 14:58:44 +08:00
parent a89634f0df
commit db16ec323a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/organization/index.js
View File

@ -10,11 +10,9 @@ import Sequence from "./components/sequence/Sequence";
import Group from "./components/group/Group";
import OfficeManage from "./components/office/officeManage";
import CompanyExtend from "./components/company/CompanyExtend"
<<<<<<< HEAD
import BranchNumSetting from "./components/branchNumSetting"
=======
import Company from "./components/company/company";
>>>>>>> feature/cl
import stores from "./stores";
import "./style/index";