From b7b10f78abc7ba462e5c602ba7e70d4739e316b8 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期二, 24 六月 2025 09:00:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquStatuVo.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquStatuVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquStatuVo.java index 3f5d8c7..a602de9 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquStatuVo.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquStatuVo.java @@ -47,8 +47,10 @@ /** * 璁惧鍚嶇О */ - @Translation(type = TransConstant.EQU_ID_TO_NAME, mapper = "equId") private String equName; + + + private String assetNo; /** * 鍙樻洿鍓嶇姸鎬� @@ -96,4 +98,19 @@ private String remark; + /** + * 纭浜� + */ + private Long confirmor; + + + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "confirmor") + private String confirmorName; + + /** + * 鍙樻洿鍗曠姸鎬侊紙0-鐢宠锛�1-鍚屾剰锛�2-椹冲洖锛� + */ + private String orderStatus; + + } -- Gitblit v1.9.3