From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
index 3e683d8..75ef549 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -1,7 +1,7 @@
 package com.ruoyi.sales.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -17,71 +17,74 @@
     @TableId(type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
+    @Schema(description = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
     private Integer salesLedgerId;
 
-    @ApiModelProperty(value = "sales_ledger_product涓婚敭")
+    @Schema(description = "sales_ledger_product涓婚敭")
     private Integer salesLedgerProductId;
 
-    @ApiModelProperty(value = "寮�绁ㄧ櫥璁拌〃invoice_registration涓婚敭")
+    @Schema(description = "寮�绁ㄧ櫥璁拌〃invoice_registration涓婚敭")
     private Integer invoiceRegistrationId;
 
-    @ApiModelProperty(value = "浜у搧澶х被")
+    @Schema(description = "浜у搧澶х被")
     private String productCategory;
 
-    @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+    @Schema(description = "瑙勬牸鍨嬪彿")
     private String specificationModel;
 
-    @ApiModelProperty(value = "鍗曚綅")
+    @Schema(description = "鍗曚綅")
     private String unit;
 
-    @ApiModelProperty(value = "鏁伴噺")
+    @Schema(description = "鏁伴噺")
     private BigDecimal quantity;
 
-    @ApiModelProperty(value = "绋庣巼")
+    @Schema(description = "绋庣巼")
     private BigDecimal taxRate;
 
-    @ApiModelProperty(value = "鍚◣鍗曚环")
+    @Schema(description = "鍚◣鍗曚环")
     private BigDecimal taxInclusiveUnitPrice;
 
-    @ApiModelProperty(value = "鍚◣鎬讳环")
+    @Schema(description = "鍚◣鎬讳环")
     private BigDecimal taxInclusiveTotalPrice;
 
-    @ApiModelProperty(value = "涓嶅惈绋庢�讳环")
+    @Schema(description = "涓嶅惈绋庢�讳环")
     private BigDecimal taxExclusiveTotalPrice;
 
-    @ApiModelProperty(value = "鍙戠エ绫诲瀷")
+    @Schema(description = "鍙戠エ绫诲瀷")
     private String invoiceType;
 
-    @ApiModelProperty(value = "寮�绁ㄦ暟")
-    private Integer invoiceNum;
+    @Schema(description = "寮�绁ㄦ暟")
+    private BigDecimal invoiceNum;
 
-    @ApiModelProperty(value = "鏈紑绁ㄦ暟")
-    private Integer noInvoiceNum;
+    @Schema(description = "鏈紑绁ㄦ暟")
+    private BigDecimal noInvoiceNum;
 
-    @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+    @Schema(description = "寮�绁ㄩ噾棰�")
     private BigDecimal invoiceAmount;
 
-    @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+    @Schema(description = "鏈紑绁ㄩ噾棰�")
     private BigDecimal noInvoiceAmount;
 
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @Schema(description = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @Schema(description = "淇敼鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty(value = "绉熸埛ID")
+    @Schema(description = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
-    private Integer tenantId;
+    private Long tenantId;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3