From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 24 六月 2025 16:28:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java index 441bcfb..06544b1 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java @@ -116,6 +116,23 @@ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") private String splrCode; + @ApiModelProperty("渚涘簲鍟咺D") + private Long splrId; + + /** + * 骞冲彴鏍囪瘑锛堣鍙凤級 + */ + @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級") + private String platItemId; + + @ApiModelProperty("瀹㈡埛璁㈠崟鍙�") + private String platOrderCode; + + @ApiModelProperty("宸ュ崟鍙�") + private String platWorkCode; + + @ApiModelProperty("椤圭洰鍙�") + private String projectCode; /** * 搴撳瓨鎵规 */ @@ -174,6 +191,7 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") + @TableLogic private Integer deleted; /** -- Gitblit v1.9.1