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

peng

6 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

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

@@ -26,6 +26,20 @@

    private String commentGroup;

    /**
     * 抽奖活动
     */
    private String prizeTopic;

    private String prizeGroup;

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

    private String videoGroup;

    private String promotionTopic;

    private String promotionGroup;