文件冲突解决

Model\ComBusinessDistrict.php、ComCounty.php
View\ComRole\index.php
View\layouts\columns_countent.php