Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

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

@@ -119,6 +119,9 @@
    @ApiModelProperty(value = "指标值（正则匹配的选项值）")
    private String targetvalue;

    @ApiModelProperty(value = "指标ID(问题上的)")
    private Integer targetid;


    @ApiModelProperty(value = "通过正则解析的值")
    private String matchedtext;