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/pojo/PurchaseLedger.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index fef46ea..3c5d247 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -90,7 +90,7 @@
     /**
      * 闄勪欢鏉愭枡璺緞鎴栧悕绉�
      */
-    @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
+//    @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
     private String attachmentMaterials;
 
     /**
@@ -151,6 +151,7 @@
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
     @ApiModelProperty("瀹℃壒鐘舵��  1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+    @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
     private Integer approvalStatus;
 
     @ApiModelProperty(value = "妯℃澘鍚嶇О")
@@ -158,4 +159,9 @@
     @ApiModelProperty(value = "瀹℃壒浜篿d")
     private String approveUserIds;
 
+    @ApiModelProperty(value = "鍙拌处鍒嗙被")
+    @Excel(name = "鍙拌处鍒嗙被(1-瀵瑰叕/2-瀵圭)")
+    @TableField(exist = false)
+    private Integer purchaseType;
+
 }

--
Gitblit v1.9.3