From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3966071..bc3e5fd 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -192,6 +192,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @ApiModelProperty("蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -202,7 +210,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍙戣揣鐘舵��")
- private String shippingStatus;
+ private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
@@ -227,4 +235,13 @@
@TableField(exist = false)
private Integer hasSufficientStock;
+
+ @TableField(exist = false)
+ private String uidNo;
+
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batchNo;
+
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String customer;
}
--
Gitblit v1.9.3