Merge branch 'master' into master-任务组

陈昶聿

9 天以前 37e23ae4323114564dadbacf75449b75ad957bbf

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

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

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