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

peng

5 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 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;