Merge remote-tracking branch 'origin/master'

xuhy

2024-10-14 e9f36d42efaa757c7f93b00ba3ff9fb0d0bf46c9

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

@@ -39,6 +39,9 @@
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "对应跳转订单号")
    @TableField("order_code")
    private String orderCode;
    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;
@@ -71,5 +74,9 @@
    @TableField(exist = false)
    private String orderNum;

    @TableField(exist = false)
    private Integer goodType;



}