Merge branch 'hotfix/change_develop_type' of wmtx/platform into master

优化公司关系跟随

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -377,9 +377,8 @@ class PromoteCompanyController extends ThinkController
                 $v['company_id'] = M("promote_company","tab_")->add($company_info);
             }else{
                 //编辑
-
-                M("promote_company","tab_")->save($company_info);
                 $this->changePromote($company_info);
+                M("promote_company","tab_")->save($company_info);
             }
 
             //业务逻辑