From 8c6aad555647fcecaddfaed99516d8b93db837c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 01 四月 2026 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java b/src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java
index a9fd729..d8e0db7 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java
@@ -1,10 +1,11 @@
package com.ruoyi.production.pojo;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("production_settlement_details")
-@ApiModel(value="ProductionSettlementDetails瀵硅薄", description="鐢熶骇鎴愭湰鏍哥畻瀵规瘮鏄庣粏琛�")
+@ApiModel(value = "ProductionSettlementDetails瀵硅薄", description = "鐢熶骇鎴愭湰鏍哥畻瀵规瘮鏄庣粏琛�")
public class ProductionSettlementDetails implements Serializable {
private static final long serialVersionUID = 1L;
@@ -56,26 +57,8 @@
@ApiModelProperty(value = "棰勭畻鎬绘垚鏈�")
private BigDecimal budgetTotal;
- @ApiModelProperty(value = "瀹為檯鑰楅噺")
- private BigDecimal actualQty;
-
- @ApiModelProperty(value = "瀹為檯鍗曚环")
- private BigDecimal actualPrice;
-
- @ApiModelProperty(value = "瀹為檯鎬绘垚鏈�")
- private BigDecimal actualTotal;
-
- @ApiModelProperty(value = "鑰楅噺宸紓")
- private BigDecimal diffQty;
-
- @ApiModelProperty(value = "鍗曚环宸紓")
- private BigDecimal diffPrice;
-
- @ApiModelProperty(value = "鎬绘垚鏈樊寮�")
- private BigDecimal diffTotal;
-
@ApiModelProperty(value = "绉熸埛ID")
+ @TableField(value = "tenant_id", fill = FieldFill.INSERT)
private Long tenantId;
-
}
--
Gitblit v1.9.3