Merge branch 'refs/heads/master' into master-手术随访

陈昶聿

3 天以前 50443fef22aaa77a1456e1981b51c10e69618b34

 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;