调整合并冲突

@@ -44,11 +44,7 @@ func (repository *ArticleRepository) Update(ctx context.Context, conn transactio
 		return nil, err
 		return nil, err
 	}
 	}
 	queryFunc := func() (interface{}, error) {
 	queryFunc := func() (interface{}, error) {
-<<<<<<< HEAD
-		tx = tx.Model(m).Save(m)
-=======
 		tx = tx.Model(m).Select("*").Updates(m)
 		tx = tx.Model(m).Select("*").Updates(m)
->>>>>>> dev
 		return nil, tx.Error
 		return nil, tx.Error
 	}
 	}
 	if _, err = repository.Query(queryFunc, m.CacheKeyFunc()); err != nil {
 	if _, err = repository.Query(queryFunc, m.CacheKeyFunc()); err != nil {