From 22a92a5ef843462daa5d3021679415eecbaf5462 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 20 五月 2022 17:21:36 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/java/zy/cloud/wms/manager/entity/Item.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 a448111..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,16 +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();
- }
+// 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 "";
+// }
- 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