Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

models/feed_template_detail.go

@@ -5,7 +5,7 @@ type FeedTemplateDetail struct {
 	PastureId      int64   `xorm:"pastureid" json:"pasture_id"`
 	FtId           int64   `xorm:"ftid" json:"ft_id"`
 	FId            int64   `xorm:"fid" json:"f_id"`
-	FdName         string  `xorm:"fdname" json:"fd_name"`
+	FName          string  `xorm:"fname" json:"f_name"`
 	LWeight        float64 `xorm:"lweight" json:"l_weight"`
 	FWeight        float64 `xorm:"fweight" json:"f_weight"`
 	IsLockCount    int32   `xorm:"islockcount" json:"is_lock_count"`

module/group.go

@@ -354,10 +354,12 @@ func FeedTemplateDetailList(req *models.FeedListRequest) ([]*models.FeedTemplate
 	total, err = newSession.Table(new(models.FeedTemplateDetail).TableName()).
 		Where("pastureid = ?", req.PastureId).Count(&res)
 	if err != nil {
+		fmt.Println("=========FeedTemplateDetailList==========", err)
 		return nil, 0, err
 	}
 
 	if err = newSession.Table(new(models.FeedTemplateDetail).TableName()).Limit(int(req.PageSize), int(req.Page-1)*int(req.PageSize)).Find(&res); err != nil {
+		fmt.Println("=========newSession==========", err)
 		return nil, 0, err
 	}
 	return res, total, nil