Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java

@@ -45,6 +45,9 @@
    @ApiModelProperty(value = "合作商状态")
    private String shopCustomStatus;

    @ApiModelProperty(value = "商户统一分成比例")
    private String shopCommonProportion;

    @ApiModelProperty(value = "来源渠道")
    private String shopSourceChannel;

@@ -89,4 +92,11 @@

    @ApiModelProperty(value = "活跃度list")
    private List<MgtActivenessVo> mgtActivenessVoList;
    
    @ApiModelProperty(value = "门店课程设置-展示名称")
    private String storeCourseDisplayName;
    
    @ApiModelProperty(value = "门店课程设置-验证密码")
    private String storeCourseDisplayPassword;
    
}