Merge branch 'master' into master-手术随访

陈昶聿

昨天 e12b7983327f4881f91c8d081c52abbbf5bbc1e4

 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;