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

peng

4 天以前 463add4ee035938f9622a6c981668620f097067d

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

@@ -19,6 +19,8 @@
    @ApiModelProperty("来源默认system,system/user")
    private String source;

    private String videoId;

    /**
     * @see VideoTypeEnum
     */