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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 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;


}