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

陈昶聿

18 小时以前 5dcd6447f315e821727508cd26bf05f8220b39c8

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

@@ -669,4 +669,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "继续时间下次")
    private Date continueTimeNext;

    @ApiModelProperty(value = "手术记录id 对应pat_med_operation_item.id")
    private Long operationItemId;
}