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

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java

@@ -152,7 +152,8 @@
    @ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
    private String xiaoeUserId;


    @ApiModelProperty("修改价格权限（0=关，1=开）")
    private Integer modifyPricePermission;