Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 0a46169a5fdd1bfec692500d2509e2bf1a21d5e0

 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;