# Conflicts: # jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/ProducerServiceImpl.java
Conflicts: pom.xml