Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 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;