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

无关风月

2025-06-09 f39e7de8be43eda95560f49982b6cd0345e24404

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java

@@ -45,6 +45,9 @@
    @ApiModelProperty(value = "凭证")
    @TableField("img")
    private String img;
    @ApiModelProperty(value = "操作人")
    @TableField("handle")
    private String handle;
    @ApiModelProperty(value = "加盟商名称")
    @TableField(exist = false)
    private String franchiseeName;