Merge branch 'wenxliu/RecommenderRPSpotPlacementScore20250605' of https://github.com/Elina-L/azure-cli into wenxliu/RecommenderRPSpotPlacementScore20250605

Author: Elina-L

src/azure-cli/azure/cli/command_modules/compute_recommender/aaz/latest/compute_recommender/_spot_placement_score.py

@@ -66,19 +66,13 @@ def _build_arguments_schema(cls, *args, **kwargs):
             options=["--desired-locations"],
             arg_group="SpotPlacementScoresInput",
             help="The desired regions",
-<<<<<<< HEAD
             required=True,
-=======
->>>>>>> d28cce464 (Initial commit: generate spot placement score py)
         )
         _args_schema.desired_sizes = AAZListArg(
             options=["--desired-sizes"],
             arg_group="SpotPlacementScoresInput",
             help="The desired resource SKUs.",
-<<<<<<< HEAD
             required=True,
-=======
->>>>>>> d28cce464 (Initial commit: generate spot placement score py)
         )
 
         desired_locations = cls._args_schema.desired_locations
@@ -182,13 +176,8 @@ def content(self):
             )
             _builder.set_prop("availabilityZones", AAZBoolType, ".availability_zones")
             _builder.set_prop("desiredCount", AAZIntType, ".desired_count")
-<<<<<<< HEAD
             _builder.set_prop("desiredLocations", AAZListType, ".desired_locations", typ_kwargs={"flags": {"required": True}})
             _builder.set_prop("desiredSizes", AAZListType, ".desired_sizes", typ_kwargs={"flags": {"required": True}})
-=======
-            _builder.set_prop("desiredLocations", AAZListType, ".desired_locations")
-            _builder.set_prop("desiredSizes", AAZListType, ".desired_sizes")
->>>>>>> d28cce464 (Initial commit: generate spot placement score py)
 
             desired_locations = _builder.get(".desiredLocations")
             if desired_locations is not None: