From 455b965c6435b5359bb5c25f2b6810dbc06f5481 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index c729ea9..3b04a03 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -31,10 +30,16 @@
* 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
*/
@ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ private Long saleLedgerProductId;
+
+ /**
+ * 浜у搧瑙勬牸id
+ */
+ @ApiModelProperty(value = "浜у搧瑙勬牸id")
private Long productModelId;
/**
- * 宸ヨ壓璺嚎id
+ * 妯＄増鐨勫伐鑹鸿矾绾縤d
*/
@ApiModelProperty(value = "宸ヨ壓璺嚎id")
private Long routeId;
@@ -95,6 +100,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime productionDate;
}
--
Gitblit v1.9.3