From 1ae9b57657199f46affc9083c39681f1ec934e3f Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 26 五月 2025 17:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
index 1164ab7..1239559 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
@@ -44,9 +44,10 @@
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
- /**宸ュ叿鍏ュ簱鏂瑰紡*/
- @Excel(name = "宸ュ叿鍏ュ簱鏂瑰紡", width = 15)
- @ApiModelProperty(value = "宸ュ叿鍏ュ簱鏂瑰紡")
+ /**宸ュ叿鍏ュ簱绫诲瀷*/
+ @Excel(name = "宸ュ叿鍏ュ簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "宸ュ叿鍏ュ簱绫诲瀷")
+ @Dict(dicCode = "in_storehouse_type")
private String inStorehouseType;
/**搴撲綅鍙�*/
@Excel(name = "搴撲綅鍙�", width = 15)
@@ -64,6 +65,7 @@
2.鎵嬪伐鎿嶄綔*/
@Excel(name = "鍏ュ簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔", width = 15)
@ApiModelProperty(value = "鍏ュ簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔")
+ @Dict(dicCode = "inbound_operate_type")
private java.lang.String operateType;
/**鍏ュ簱鏃堕棿*/
@Excel(name = "鍏ュ簱鏃堕棿", width = 15, format = "yyyy-MM-dd")
--
Gitblit v1.9.3