From 206fcf7d6afae27856f63cf0158f53b61fa1b86f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 19 九月 2025 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java |    9 +++++++++
 1 files changed, 9 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 83c3465..fc7c7f3 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
@@ -113,4 +113,13 @@
     @TableField("refund_status")
     private Integer refundStatus;
 
+    @ApiModelProperty(value = "供应商id")
+    @TableField("supplier_id")
+    private String supplierId;
+
+
+    @ApiModelProperty(value = "商户号")
+    @TableField("merchant_no")
+    private String merchantNo;
+
 }

--
Gitblit v1.7.1