Merge remote-tracking branch 'origin/master'

doum

2026-04-22 4f604171623fb28f81bfcec07bd25737d7284649

 server/services/src/main/java/com/doumee/dao/dto/ShopNearbyDTO.java

@@ -36,4 +36,7 @@
    @ApiModelProperty(value = "门店名称（模糊查询）", example = "XX门店")
    private String name;

    @ApiModelProperty(value = "城市主键", example = "1")
    private Integer cityId;

}