From a56440a0bf217c65ea9069694fb9e192dbf404ce Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 14 七月 2025 09:44:22 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
index d1f58df..e337025 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
@@ -9,6 +9,7 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.wms.asrs.entity.dto.MatnrDetlDto;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -147,10 +148,10 @@
@ApiModelProperty(value= "搴撳瓨鍐荤粨 1: 鍐荤粨 0: 姝ｅ父")
private Integer freeze;
-// @ApiModelProperty("鐗╂枡淇℃伅")
-// @TableField(exist = false)
-// @Delegate
-// private Mat mats;
+ @ApiModelProperty("鐗╂枡淇℃伅")
+ @TableField(exist = false)
+ private MatnrDetlDto mats;
+
public LocDetl() {}
--
Gitblit v1.9.1