From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 672fe75..519fd8a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,16 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -143,5 +144,42 @@
@TableField(exist = false)
//鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
+
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
+
+ /**
+ * 瀹㈡埛鍦板潃
+ */
+ @TableField(exist = false)
+ private String companyAddress;
+
+ /**
+ * 瀹㈡埛鑱旂郴鐢佃瘽
+ */
+ @TableField(exist = false)
+ private String contactPhone;
+
+ /**
+ * 瀹㈡埛鑱旂郴浜�
+ */
+ @TableField(exist = false)
+ private String contactPerson;
+
+ /**
+ * 瀹㈡埛鍏徃鐢佃瘽
+ */
+ @TableField(exist = false)
+ private String companyPhone;
+
+ @TableField(exist = false)
+ private List<SalesLedgerProduct> productList;
+
+ /**
+ * 鏄惁鐢熶骇
+ */
+ @ApiModelProperty(value = "鏄惁鐢熶骇")
+ private boolean isProduce;
}
--
Gitblit v1.9.3