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/ProductionSettlementBatches.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionSettlementBatches.java b/src/main/java/com/ruoyi/production/pojo/ProductionSettlementBatches.java
index 87e8e97..208d4dd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionSettlementBatches.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionSettlementBatches.java
@@ -1,11 +1,11 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("production_settlement_batches")
-@ApiModel(value="ProductionSettlementBatches瀵硅薄", description="鐢熶骇鎴愭湰鏍哥畻鎵规涓昏〃")
+@ApiModel(value = "ProductionSettlementBatches瀵硅薄", description = "鐢熶骇鎴愭湰鏍哥畻鎵规涓昏〃")
public class ProductionSettlementBatches implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,21 +34,17 @@
private Long id;
@ApiModelProperty(value = "鏍哥畻褰掑睘鏈堜唤")
- private LocalDate periodTime;
-
- @ApiModelProperty(value = "鎵规鍚嶇О")
- private String batchName;
-
- @ApiModelProperty(value = "鐘舵�侊細0-浠呴绠楋紝1-缁撶畻璁＄畻涓紝2-宸插畬鎴愮粨绠楋紝3-宸查攣瀹�")
- private Integer status;
+ private String periodTime;
@ApiModelProperty(value = "瀵煎叆鐢ㄦ埛")
private String createUser;
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "绉熸埛ID")
+ @TableField(value = "tenant_id", fill = FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3