Merge branch 'dev' into send_coupon

peng

1 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 pom.xml

@@ -77,6 +77,7 @@
        <module>consumer</module>
        <module>admin</module>
        <module>im-api</module>
        <module>lmk-job</module>
    </modules>

    <build>