From 2656ae9bce8544d81da66c07aaede5386d6fbebb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 25 七月 2025 15:41:01 +0800
Subject: [PATCH] 1.序列化问题 2.设备领用逻辑优化
---
main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
index b2bb962..809680e 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
@@ -102,10 +103,15 @@
@TableField(value = "net_profit")
private BigDecimal netProfit;
/**
- * 杩愯垂
+ * 閲囪喘杩愯垂
*/
- @TableField(value = "freight")
- private BigDecimal freight;
+ @TableField(value = "purchasing_freight")
+ private BigDecimal purchasingFreight;
+ /**
+ * 閿�鍞繍璐�
+ */
+ @TableField(value = "sales_freight")
+ private BigDecimal salesFreight;
/**
* 鐧昏浜篿d
*/
@@ -126,5 +132,6 @@
* 鏄惁娣诲姞鑷冲緟琛ュ簱
*/
@TableField(value = "is_add")
+ @JsonProperty("isAdd")
private boolean isAdd;
}
\ No newline at end of file
--
Gitblit v1.9.3