Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-25 4c1a7c9a3ca949ce878d9f5683fdafce4acbe635

 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;


}