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

huliguo

15 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtTransferShopDto.java

@@ -17,9 +17,9 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty("转移用户id")
    @ApiModelProperty(value="转移用户id")
    private Long transferUserId;

    @ApiModelProperty("转移备注")
    @ApiModelProperty(value="转移备注")
    private String transferRemark;
}