Merge branch 'cygx_youhua_02-22' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/timeline_log.go

@@ -17,7 +17,6 @@ type CygxTimelineLog struct {
 	CreateTime             time.Time `description:"创建时间"`
 	ModifyTime             time.Time `description:"更新时间"`
 	RealName               string    `description:"用户实际名称"`
-	Source                 int       `description:"来源1查研观向"`
 }
 
 // 判断用户是否阅读过该产业下的时间线

services/industrial_management.go

@@ -233,7 +233,7 @@ func HandleIndustryList(list []*models.IndustrialManagement, user *models.WxUser
 	//haveMorningMeeting := false
 	//var morningMeetingTime string
 	recrodList, err := models.GetCygxTimelineLogCount(user.UserId, industrialIdArr)
-	if err != nil {
+	if err != nil && err.Error() != utils.ErrNoRow() {
 		return
 	}
 	var industrialManagementIdstr string