Merge branch 'dev' into pre-production

1 year ago · 3a8460899a
1 changed files with 1 additions and 1 deletions
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java
@ -30,7 +30,7 @@ public class IndicatorsEntity  extends TenantEntity {
 	private Long classifyId;
 	@ApiModelProperty(value = "考核指标名称")
-	private Long classifyName;
+	private String classifyName;
 	@ApiModelProperty(value = "分数")
 	private int point;