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

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 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;


}