Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2022-10-31 14:40:34 +08:00
parent 9313072d51 3044a8654d
commit 9560826128
6 changed files with 48 additions and 21 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
@@ -79,7 +79,7 @@ public class PointServiceImpl implements PointService {
                    String[] types = split[j].split("-");
                    typeArr.put(types[0], types[1]);
                }
-                object.put("point_status_name", typeArr.getString(point_type));
+                object.put("point_type_name", typeArr.getString(point_type));
            }
            res.add(object);
        }