Merge branch 'fix_zhengshi' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity.go

@@ -327,7 +327,7 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 				err = errs
 				return
 			}
-			permissionZhegnshiStr, errs = models.GetCompanyPermissionByUserZhengShi(companyId)
+			permissionZhegnshiStr, errs = models.GetCompanyPermissionByUser(companyId)
 			if errs != nil {
 				err = errs
 				return