Merge remote-tracking branch 'origin/master'

liusheng

20 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

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

@@ -661,7 +661,7 @@
    private Date continueTimeNow;

    @ApiModelProperty(value = "继续内容")
    private JSONObject continueContent;
    private String continueContent;

    @ApiModelProperty(value = "继续次数")
    private Integer continueCount;