Merge branch 'cygx_8.2.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -97,6 +97,7 @@ func (this *ArticleController) Detail() {
 				br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
 				return
 			}
+			popupMsg = "需要升级行业套餐权限才可查看此报告，请联系对口销售"
 			resp.PopupMsg = popupMsg
 			resp.HasPermission = hasPermission
 			resp.SellerName = sellerName

services/company_permission.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strings"
@@ -61,7 +60,6 @@ func GetUserHasPermission(user *models.WxUserItem) (hasPermission int, sellerNam
 					err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
 					return
 				}
-				fmt.Println(sellerItemQy)
 				if sellerItemQy != nil {
 					hasPermission = 2
 					sellerName = sellerItemQy.Mobile