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

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

@@ -236,13 +236,13 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			appendStatus = true;
 		}
 		// 规则启用
-		Boolean status;
+		String status;
 		if (e.getEnabledFlag().equals(NumConstant.ZERO_STR)){
-			status = false;
+			status = "false";
 		}else {
-			status = true;
+			status = "true";
 		}
-		if(!status.toString().equals(f.getEnabledFlag())){
+		if(!status.equals(f.getEnabledFlag())){
 			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag());
 			sb.append(s).append("，");
 			appendStatus = true;