Merge remote-tracking branch 'origin/dev_heart' into dev_heart

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java

@@ -18,6 +18,7 @@ public class PointDetailResultDTO implements Serializable {
 	private String ruleDesc;
 	private Integer point;
 	private String pointUnit;
+	private String pointUnitDesc;
 	private Integer upLimit;
 	private Boolean enabledFlag;
 	private String upLimitDesc;

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -131,6 +131,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
 		resultDTO.setRuleId(pointRuleEntity.getId());
 		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
+		resultDTO.setPointUnitDesc(PointUnitEnum.getEnum(pointRuleEntity.getPointUnit()).getDesc());
 		return resultDTO;
 	}