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

peng

8 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

 framework/src/main/java/cn/lili/common/properties/RocketmqCustomProperties.java

@@ -26,6 +26,13 @@

    private String commentGroup;

    /**
     * 视频
     */
    private String videoTopic;

    private String videoGroup;

    private String promotionTopic;

    private String promotionGroup;