Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-11 66107e6f0bb5c47192eb0178aba60dc9df061be8

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

@@ -12,5 +12,7 @@

    @ApiModelProperty(value = "纬度")
    private String lat;
    @ApiModelProperty(value = "门店id")
    private Integer shopId;

}