From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..7e81eb0 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,10 +55,10 @@
private String invoiceType;
@ApiModelProperty(value = "寮�绁ㄦ暟")
- private Integer invoiceNum;
+ private BigDecimal invoiceNum;
@ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private Integer noInvoiceNum;
+ private BigDecimal noInvoiceNum;
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount;
@@ -67,6 +68,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+// @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@@ -83,5 +85,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
--
Gitblit v1.9.3