Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 cloud-server-activity/src/main/java/com/dsh/activity/model/request/CommodityRequest.java

@@ -12,7 +12,8 @@

    @ApiModelProperty(value = "纬度")
    private String lat;

    @ApiModelProperty(value = "门店id")
    private Integer shopId;


}