From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java
index 21ca411..23b6d36 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java
@@ -36,11 +36,11 @@
private String outStorehouseId;
/**鍒�鍏风紪鐮�*/
@Excel(name = "鍒�鍏风紪鐮�", width = 15)
- @ApiModelProperty(value = "鍒�鍏风紪鐮�")
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�(tms_base_tool琛ㄤ富閿甶d)")
private String toolCode;
/**鍒�鍏风紪鍙�*/
@Excel(name = "鍒�鍏风紪鍙�", width = 15)
- @ApiModelProperty(value = "鍒�鍏风紪鍙�")
+ @ApiModelProperty(value = "鍒�鍏风紪鍙�(鍒�鍏峰敮涓�缂栫爜锛岀鍒版妸鐨勫睘鎬�)")
private String toolId;
/**鐢宠鍑哄簱鏁伴噺*/
@Excel(name = "鐢宠鍑哄簱鏁伴噺", width = 15)
@@ -69,7 +69,7 @@
@Excel(name = "鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚", width = 15)
@ApiModelProperty(value = "鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚")
@Dict(dicCode = "out_storehouse_status")
- private Integer status;
+ private String status;
/**绉熸埛鍙�*/
@Excel(name = "绉熸埛鍙�", width = 15)
@ApiModelProperty(value = "绉熸埛鍙�")
--
Gitblit v1.9.3