From de0bf07d8497ec97750de8adabd6a30146fe9557 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 七月 2026 11:32:26 +0800
Subject: [PATCH] fix:1.发货审批不通过时,对应的发货车牌应不展示2.审批模版被其他审批引用时,不能进行编辑或删除操作

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |    5 ++++-
 1 files changed, 4 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 00736ba..c8a0443 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -50,7 +50,7 @@
     /**
      * 褰曞叆鏃ユ湡
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryDate;
@@ -109,6 +109,9 @@
     @Schema(description = "浠樻鏂瑰紡")
     private String paymentMethod;
 
+    @Schema(description = "瀹為檯鍚堝悓閲戦")
+    private BigDecimal netContractAmount;
+
     @TableField(exist = false)
     @Schema(description = "鐢熶骇鐘舵��")
     private String productionStatus = "鏈紑濮�";

--
Gitblit v1.9.3