Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 543e0a9c357e9354cd47eba36e8a2e6b9582ecd0

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopWithdraw.java

@@ -78,5 +78,9 @@
    @TableField("create_user_id")
    private Long createUserId;

    @ApiModelProperty(value = "门店名称")
    @TableField(exist = false)
    private String shopName;


}