Merge remote-tracking branch 'origin/release-201843-wangcz' into release-201843-wangcz

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -393,7 +393,7 @@
 				币别：<span ng-bind="::(isUser?'-':inquiryItem.currency)"></span>
 			</td>
 			<td>
-				税率：<span ng-bind="inquiryItem.taxrate || '-'"></span>%
+				税率：<span ng-bind="inquiryItem.taxrate || 0"></span>%
 			</td>
 			<td class="text-right" colspan="2" class="order-sum">
 				<div ng-if="inquiryItem.replyable">