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/bo/EimsEquStatuBo.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquStatuBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquStatuBo.java index 2851e41..dd1efa4 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquStatuBo.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquStatuBo.java @@ -60,7 +60,6 @@ /** * 鍙樻洿鎻忚堪 */ - @NotBlank(message = "鍙樻洿鎻忚堪涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) private String changeDesc; /** @@ -68,5 +67,13 @@ */ private String remark; + /** + * 纭浜� + */ + private Long confirmor; + /** + * 鍙樻洿鍗曠姸鎬侊紙0-鐢宠锛�1-鍚屾剰锛�2-椹冲洖锛� + */ + private String orderStatus; } -- Gitblit v1.9.3