修改用户反馈信息，新增系统奖励

internal/logic/feedback/feedback.go

@@ -35,7 +35,7 @@ func (s *sFeedback) List(ctx context.Context, in *model.FeedbackIn) (out *model.
 	// 判断角色
 	if in.Role == consts.MerchantRoleCode {
 		m = m.Where(do.Feedbacks{
-			MerchatId: in.OperatorId,
+			MerchantId: in.OperatorId,
 		})
 	} else if in.Role == consts.StoreRoleCode {
 		m = m.Where(do.Feedbacks{
@@ -87,7 +87,7 @@ func (s *sFeedback) Create(ctx context.Context, in *model.FeedbackCreateIn) (out
 		FeedbackType: in.FeedbackType,
 		UserId:       in.OperatorId,
 		StoreId:      in.StoreId,
-		MerchatId:    in.MerchantId,
+		MerchantId:   in.MerchantId,
 	})
 	if err != nil {
 		return nil, err