Merge branch 'cygx/cygx_bug_9-20' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/company_permission.go

@@ -79,7 +79,9 @@ func RaiCompanyPermissionAndCheckList(companyId int, unify bool) (resp *company.
 			v.RaiBothHas = true
 			v.Remark = v.PermissionName
 			v.PermissionName += "(升级)"
-			v.PermissionType = 0
+			if !unify {
+				v.PermissionType = 0
+			}
 			v.PermissionTypeName = ""
 			v.IsMerge = true
 		}