Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

DELL

6 天以前 88abda34da2c7437c8191da83972279d18ff9418

 src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java

@@ -42,7 +42,7 @@
    private Integer paramType;

    @ApiModelProperty(value = "标准参数对应数据名称")
    private Integer paramName;
    private String paramName;

    @ApiModelProperty(value = "基准值")
    private Float basisVal;