Merge remote-tracking branch 'origin/master'

liusheng

9 天以前 274d8e2950e79e73b14783e497cdaf97f7dbb8d3

 smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java

@@ -153,7 +153,7 @@
     */
    @Excel(name = "选项分数")
    @ApiModelProperty(value = "选项分数")
    private BigDecimal score;
    private String score;

//    /**
//     * 预警阀值上限