Merge branch 'dev4.6.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.1

src/jfw/modules/bigmember/src/entity/followEnterprise.go

@@ -253,7 +253,6 @@ func (this *EntFollow) GetEntFollowList(pNum, pSize int, match, group string) (f
 func (this *EntFollow) GetEntFollowAndChangeList(num int) (followData []map[string]interface{}, err error) {
 	res, _ := db.Mgo.Find(this.SaveTable, map[string]interface{}{"s_userid": this.UserId}, `{"l_lastpushtime":-1}`, `{"s_entname":1,"i_apppushunread":1,"s_entId":1,"l_lastpushtime":1}`, false, 0, num)
 	if res == nil || len(*res) == 0 {
-		err = errors.New("查询异常")
 		return
 	}
 	//加密entId,查询变更条数

src/jfw/modules/bigmember/src/service/follow/enterprise.go

@@ -111,9 +111,6 @@ func (this *FollowEnt) PcSimpleFollowList() {
 		if err != nil {
 			return nil, err
 		}
-		if !followEntManager.HasPower {
-			return nil, fmt.Errorf("暂无权限")
-		}
 		pSize, _ := this.GetInteger("size") //每页数据量
 		if pSize <= 0 || pSize > 10 {
 			pSize = 10