From b3cfcdd210536fa672b36e37b0f54bb9c4e98ada Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期五, 20 六月 2025 14:22:13 +0800 Subject: [PATCH] feat(tabbar): 二维码扫描功能适配 H5 端- 在 fg-tabbar 组件中添加了对 H5 端二维码扫描的支持 - 引入 qrcode 解析库以处理 H5 端的二维码扫描结果 - 根据平台类型(app 或 H5)选择不同的扫描方式 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java index f59e6cf..287ef5c 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsMaintPlanBo.java @@ -79,13 +79,13 @@ /** * 淇濆吇浜� */ - @NotNull(message = "淇濆吇浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "淇濆吇浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class }) private Long maintUser; /** * 淇濆吇閮ㄩ棬 */ - @NotNull(message = "淇濆吇閮ㄩ棬涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "淇濆吇閮ㄩ棬涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) private Long maintDept; /** @@ -97,19 +97,21 @@ /** * 棣栨鎵ц鏃堕棿 */ - @NotNull(message = "淇濆吇璁″垝棣栨鎵ц鏃堕棿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") private Date maintFirstTime; /** * 涓婃鎵ц鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date maintLastTime; /** * 涓嬫鎵ц鏃堕棿 */ + @NotNull(message = "涓嬫淇濆吇鏃堕棿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) @JsonFormat(pattern = "yyyy-MM-dd") private Date maintNextTime; @@ -122,7 +124,7 @@ * 涓婃鐢熸垚宸ュ崟鏃堕棿 */ @JsonFormat(pattern = "yyyy-MM-dd") - private Date lastGenerateDate; + private Date lastOrderDate; // 鍏宠仈琛ㄥ瓧娈� private String equName; -- Gitblit v1.9.3