From bcf1e1d9bb4d269e0d2a6ad0765d218adfe1fb6c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 12:45:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/java/zy/cloud/wms/manager/entity/Item.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index ac5887c..38a2ed1 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -400,6 +400,17 @@
 //            null    // 澶囨敞
 //    );
 
+//    public String getProgressRate$(){
+//        ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+//        ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+//                .eq("id", this.progressRate));
+//        if (!Cools.isEmpty(id)) {
+//            return id.getStatusName();
+//        }
+//
+//        return "";
+//    }
+
     public String getProjectStatus$(){
         ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
         ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));

--
Gitblit v1.9.1