Merge branch 'feature/bug-list' of xuyiping/kpt-tmr-group into develop

model/cattle_category.go

@@ -70,7 +70,7 @@ func (c *CattleCategory) ToPb() *operationPb.AddCattleCategoryRequest {
 	}
 }
 
-func NewPastureCattleCategory(req *operationPb.ClassRequest, pastureDetail *GroupPasture) *CattleCategory {
+func NewPastureCattleCategory(req *operationPb.CategorySyncRequest, pastureDetail *GroupPasture) *CattleCategory {
 	return &CattleCategory{
 		ParentId:    operationPb.CattleCategoryParent_Kind(req.ParentId),
 		ParentName:  req.ParentName,

model/forage_category.go

@@ -70,7 +70,7 @@ func (f *ForageCategory) ToPb() *operationPb.AddForageCategoryRequest {
 	}
 }
 
-func NewPastureForageCategory(req *operationPb.ClassRequest, pastureDetail *GroupPasture) *ForageCategory {
+func NewPastureForageCategory(req *operationPb.CategorySyncRequest, pastureDetail *GroupPasture) *ForageCategory {
 	return &ForageCategory{
 		ParentId:    operationPb.ForageCategoryParent_Kind(req.ParentId),
 		ParentName:  req.ParentName,