Merge remote-tracking branch 'origin/dev_optimize_for_ic' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java

@@ -55,6 +55,6 @@ public class BuildingTreeLevelDTO implements Serializable {
 	 * 选中具体某个楼栋：1号楼(70/100)表示共有100户，有70户住人了
 	 */
 	private String showNum;
-
+	private String showName;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -430,6 +430,7 @@ public class BuildingServiceImpl implements BuildingService {
         if(!"building".equals(parent.getLevel())){
             parent.setShowNum(CollectionUtils.isEmpty(subList) ? NumConstant.ZERO_STR : String.valueOf(subList.size()));
         }
+        parent.setShowName(String.format("%s(%s)",parent.getLabel(),parent.getShowNum()));
     }