Merge remote-tracking branch 'origin/open_gj' into open_gj
# Conflicts: # projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java # projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl # projects/fangjia-open/src/main/webapp/ccbRent/report.ftl
This commit is contained in: