From 49133ae6eafda4d6bd86ed9a9241177a12a47348 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 16:07:30 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index b56ab90..e7ec1eb 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -3,7 +3,7 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -136,34 +136,25 @@
*/
private String phoneNumber;
- @TableField(exist = false)
- @ApiModelProperty("鏉ョエ閲戦")
- private String receiptPaymentAmount;
-
- @ApiModelProperty("鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- private String unReceiptPaymentAmount;
-
- @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+ @Schema(description = "瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
private Integer approvalStatus;
- @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ @Schema(description = "妯℃澘鍚嶇О")
private String templateName;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
+ @Schema(description = "瀹℃壒浜篿d")
private String approveUserIds;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-
}
--
Gitblit v1.9.3