Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

 server/web/pom.xml

@@ -53,7 +53,8 @@
                <configuration>
                    <fork>true</fork>
                    <mainClass>com.doumee.DJWebApplication</mainClass>
                    <layout>ZIP</layout>
                    <layout>ZIP</layout><layout>ZIP</layout>
                    <includeSystemScope>true</includeSystemScope>
                </configuration>
                <executions>
                    <execution>