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

无关风月

10 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 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;

}