Merge remote-tracking branch 'origin/master'

liusheng

21 小时以前 e1e290cbef86b5a5c58b8ef238424373f00ed00b

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

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

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