House And Build searchConfition
t
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dgsoft/house/action/BuildGridMapHome.java
	src/main/resources/messages.properties
	src/main/webapp/func/house/datas/BuildGridMapEdit.xhtml