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

peng

5 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

 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
     */