POJO UPDATE:
1.擴充活動表格
2.增加活動相關表
先開啟可以上傳中小圖功能
feature:add 活動種類
bug fix: 建案資訊過濾已銷售,seller companyid 已改成sessin取出
Merge branch 'master' into developer
dev setting
Change to develop mode
Merge branch 'master' into develop
Merge branch 'develop' into feature/house_setting
refactory
bug fix: popup windows 無法計算價格
Merge branch 'master' of https://github.com/chiuyinche/SnailHouses
tune ui :popup window for object house
Merge branch 'master' into developer
Add Trigger For Obj_house status changed
add Feature:保證金- 銀行戶驗證流程
1.Add new POJO FOR CREDIT CARD FESTURE;
2.CHANGE SOME ORIGINAL TABLE
3.Bugfix FOR data column type or length change
Change Bargain records setting for employeeId
Merge branch 'master' into develop
Merge branch 'develop' into feature/house_setting

Conflicts:
	src/main/java/com/zstrength/cmn/service/CommonDataService.java
	src/main/java/com/zstrength/usr/pojo/UsrMembers.java
	src/main/resources/hbm/UsrMembers.hbm.xml