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

zxl

4 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

 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;