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

陈昶聿

昨天 e12b7983327f4881f91c8d081c52abbbf5bbc1e4

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

@@ -248,4 +248,7 @@
     */
    @ApiModelProperty("html富文本")
    private String htmlRichText;

    @ApiModelProperty("观看次数")
    private Long watchCount;
}