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

zxl

2 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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

@@ -19,6 +19,26 @@
@ConfigurationProperties(prefix = "lili.data.rocketmq")
public class RocketmqCustomProperties {

    /**
     * 评论
     */
    private String commentTopic;

    private String commentGroup;

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

    private String prizeGroup;

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

    private String videoGroup;

    private String promotionTopic;