From 65bf12d8c871308e36fff97d985f49ad6bce6adc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 四月 2026 16:01:09 +0800
Subject: [PATCH] feat: 支持个人对私录入销售订单；支持个人采购；供应商、客户档案、销售采购导入导出修改
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c91ca5e..37ae7c9 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -51,7 +51,7 @@
* 渚涘簲鍟嗗悕绉�
*/
@Excel(name = "渚涘簲鍟嗙被鍨�")
- private String supplierType;
+ private Integer supplierType;
/**
* 鏄惁鐧藉悕鍗�
*/
@@ -131,7 +131,7 @@
private Boolean hasChildren = false;
- private Integer Type;
+ private Integer type;
private List<SalesLedgerProduct> productData;
@@ -190,11 +190,6 @@
@Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
- @TableField(exist = false)
- private Integer type;
-
-
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
@ApiModelProperty("瀹℃壒鐘舵��")
@@ -203,4 +198,8 @@
private String templateName;
@ApiModelProperty(value = "瀹℃壒浜篿d")
private Integer approverId;
+
+ @ApiModelProperty("妯℃澘绫诲瀷(1-瀵瑰叕/2-瀵圭)")
+ private Integer templateType;
+
}
--
Gitblit v1.9.3