Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -75,7 +75,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                     if (project.get("regionId").equals(id)) {
                         projectNum += 1;
                         //如果项目电梯数量为null,就设置0
-                        num += null != project.get("num") ? (int) project.get("num") : 0;
+                        num += null != project.get("num") ? (long) project.get("num") : 0;
                     }
                 }
             }