From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 30097b4..36751c2 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -37,7 +37,7 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
@@ -139,5 +139,13 @@
@TableField(exist = false)
@ApiModelProperty(value = "浜よ揣澶╂暟宸�")
private Integer deliveryDaysDiff;
+
+ @TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
+
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
}
--
Gitblit v1.9.3