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

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

 fanli/src/main/resource/env-dev/rocketmq.xml

@@ -2,10 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"

   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">

   <!-- 
   <import resource="classpath:/rocket/consumer.xml" />

   <import resource="classpath:/rocket/system-coupon-consumer.xml"/>

    -->

   <import resource="classpath:/rocket/producer.xml" />

   <import resource="classpath:/rocket/transactionProducer.xml" />

</beans>