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

!5 solve conflict 

Merge pull request !5 from reset/feature/cl
This commit is contained in:
reset 2022-05-18 06:59:48 +00:00 committed by Gitee
parent c3d7a9db71 db16ec323a
commit 15e223269d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
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 Group from "./components/group/Group";
import OfficeManage from "./components/office/officeManage"; import OfficeManage from "./components/office/officeManage";
import CompanyExtend from "./components/company/CompanyExtend" import CompanyExtend from "./components/company/CompanyExtend"
<<<<<<< HEAD
import BranchNumSetting from "./components/branchNumSetting" import BranchNumSetting from "./components/branchNumSetting"
=======
import Company from "./components/company/company"; import Company from "./components/company/company";
>>>>>>> feature/cl
import stores from "./stores"; import stores from "./stores";
import "./style/index"; import "./style/index";