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

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

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

@@ -149,7 +149,11 @@
    @ApiModelProperty(value="证书list")
    private List<ShopCertificate> shopCertificateList;

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

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