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

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMemberBindingDto.java

@@ -18,4 +18,10 @@

    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value = "绑定类型1商城订单2活动订单3线下订单4核销优惠券5核销奖品6商户创建会员7平台变动")
    private Integer bindingType;

    @ApiModelProperty(value = "商户名称")
    private String shopName;
}