Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

src/main/java/com/campus/water/service/AreaService.java

@@ -234,4 +234,4 @@ public class AreaService {
         }
     }
 
-}
+}