From 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 17:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 33d2ef7..fc42a5e 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
@@ -70,6 +70,11 @@
@ApiModelProperty(value = "入库操作人")
private String warehousingUserId;
+ @ApiModelProperty(value = "入库时间")
+ @TableField("warehousing_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime warehousingTime;
+
@ApiModelProperty(value = "支付时间")
@TableField("pay_time")
@@ -128,6 +133,14 @@
@TableField("merchant_no")
private String merchantNo;
+ @ApiModelProperty(value = "供应商分佣金额")
+ @TableField("supplier_money")
+ private BigDecimal supplierMoney;
+
+ @ApiModelProperty(value = "平台是否分佣成功 1=是 2=否")
+ @TableField("is_platform_commission")
+ private Integer isPlatformCommission;
+
/**
* 新增执行
*/
--
Gitblit v1.7.1