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

module/group.go

@@ -8,6 +8,9 @@ import (
 	"time"
 	"tmr-watch/http/handle/restful"
 	"tmr-watch/models"
+	"tmr-watch/pkg/logger/zaplog"
+
+	"go.uber.org/zap"
 
 	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/pasture"
@@ -27,12 +30,15 @@ func DistributeFeedFormula(feedTemplateList []*models.FeedTemplate) error {
 		if _, err := tx.Table(new(models.FeedTemplate)).Insert(feedTemplate); err != nil {
 			return err
 		}
+
 		feedFormulaDetail := make([]*models.FeedTemplateDetail, 0)
 		for _, f := range feedTemplate.FeedFormulaDetail {
 			f.FtId = feedTemplate.Id
 			feedFormulaDetail = append(feedFormulaDetail, f)
 		}
 
+		zaplog.Info("feedFormulaDetail", zap.Any("feedFormulaDetail", feedFormulaDetail))
+
 		if _, err := tx.Table(new(models.FeedTemplateDetail)).Insert(feedFormulaDetail); err != nil {
 			return err
 		}

service/group/feed_template.go

@@ -38,6 +38,7 @@ func GetFeetTemplateVersion(ctx context.Context, pastureId, feedTemplateId int)
 	if err != nil {
 		return nil, err
 	}
+
 	newFeedTemplateDetailVersion, err := module.GetFeedDetailVersionByDesc(ctx, int64(pastureId), int64(feedTemplateId))
 	if err != nil {
 		return nil, err