Merge remote-tracking branch 'origin/master'

zhs

5 天以前 babb070a354a8ecf1473ff882e0dc8735ab59912

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

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

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