Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer

.gitignore

-# maven ignore
-target/
-*.jar
-!.mvn/wrapper/*
-*.war
-*.zip
-*.tar
-*.tar.gz
-.flattened-pom.xml
-
-# eclipse ignore
-.settings/
-.project
-.classpath
-
-# idea ignore
-.idea/
-*.ipr
-*.iml
-*.iws
-
-# temp ignore
-*.log
-*.cache
-*.diff
-*.patch
-*.tmp
-dubbo.cache*
-
-# system ignore
-.DS_Store
-Thumbs.db
-*.orig