Merge remote-tracking branch 'origin/dev' into dev

zxl

9 天以前 d9901a1d21c42372d8b38a081844177e578980a6

 framework/src/main/java/cn/lili/modules/lmk/domain/query/WxHealthVideoQuery.java

@@ -18,6 +18,9 @@

    @ApiModelProperty("来源默认system,system/user")
    private String source;


    private String videoId;
    /**
     * @see VideoTypeEnum
     */