From 3cc8093733d705ed5415e37eb82d909509590c4b Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 18 九月 2025 09:01:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java index 8feb2dc..83c3465 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java @@ -93,7 +93,24 @@ @TableField("trans_type") private String transType; - @ApiModelProperty(value = "分账流水号") + @ApiModelProperty(value = "分账指令流水号") @TableField("separate_no") private String separateNo; + + @ApiModelProperty(value = "商户分账指令流水号") + @TableField("out_separate_no") + private String outSeparateNo; + + @ApiModelProperty(value = "平台得金额") + @TableField("money") + private BigDecimal money; + + @ApiModelProperty(value = "回退流水") + @TableField("refund_out_separate_no") + private String refundOutSeparateNo; + + @ApiModelProperty(value = "1未回退 2已回退") + @TableField("refund_status") + private Integer refundStatus; + } -- Gitblit v1.7.1