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

peng

3 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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

@@ -27,6 +27,13 @@
    private String commentGroup;

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

    private String prizeGroup;

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