Merge remote-tracking branch 'origin/master'

liusheng

4 天以前 fd12c3a4d5c0a247c89ab59faba189075a302ffd

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

@@ -113,6 +113,10 @@
    private String categoryname;


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


    @ApiModelProperty(value = "指标选项")
    private String targetoptions;