Merge branch 'release-201843-wangcz' of ssh://10.10.101.21/source/platform-b2b

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

@@ -611,7 +611,8 @@
                 <span ng-bind="inquiryItem.needQty || '-'"></span>
             </td>
             <td class="text-center">
-                <!--<span>17</span>%-->
+                <span ng-if="!inquiryItem.quotation">-</span>
+                <span ng-if="inquiryItem.quotation">{{inquiryItem.quotation.taxrate || 0}}</span>%
             </td>
             <td class="text-center">
                 <span ng-bind-html="inquiryItem.endDate| datespan"></span>