修改运费模板
Merge branch 'tlw' of https://github.com/liqian008/geekway.git into tlw

Conflicts:
	geekway-model/src/main/java/com/bruce/geekway/model/wx/pay/WxDeliveryTemplate.java
	geekway-pay/src/main/java/com/bruce/geekway/controller/wx/WxProductOrderController.java
	geekway-pay/src/main/resources/deliverTemplate.xml
	geekway-pay/src/main/webapp/WEB-INF/jsp/order/buyNow.jsp
	geekway-service/src/main/java/com/bruce/geekway/service/product/IWxDeliveryTemplateService.java
	geekway-service/src/main/java/com/bruce/geekway/service/product/impl/WxDeliveryTemplateServiceImpl.java
	geekway-service/src/main/java/com/bruce/geekway/service/product/impl/WxProductSkuServiceImpl.java