Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 8c83fad498da51773d4aa6a4aa6af13f8e39e27d

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java

@@ -98,12 +98,9 @@
    @ApiModelProperty(value = "推广人姓名")
    @TableField(exist = false)
    private String inviteUserName;



    @ApiModelProperty(value = "绑定门店id")
    @TableField("shop_id")
    private Long shopId;
    private Integer shopId;
    @ApiModelProperty(value = "绑定门店名称")
    @TableField(exist = false)
    private String shopName;