Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 5b2eb84c4eb4ba5016b782b7b083585d0ee7d2d9

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

@@ -39,6 +39,9 @@
    private Long appUserId;

    @TableField(exist = false)
    private String appUserIdStr;

    @TableField(exist = false)
    @ApiModelProperty(value = "用户名称")
    private String userName;