Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

 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;

}