Merge branch 'dev_copy' of ssh://10.10.101.21/source/platform-b2b into dev-mysql

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -586,18 +586,15 @@ input[type="radio"], input[type="checkbox"] {
             <li>
                 <span>联系人&nbsp;</span><em ng-bind="::inquiryItem.userName"></em>
             </li>
-            <li>
-                <span>联系电话</span><em ng-bind="::inquiryItem.userTel"></em>
-            </li>
-            <li>
-                <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
-            </li>
             <li ng-if="inquiryItem.endDate != null">
                 <span>报价截止</span><em ng-bind="::inquiryItem.endDate | date:'yyyy-MM-dd'"></em>
             </li>
             <li  ng-if="inquiryItem.endDate == null">
                 <span>报价截止</span><em ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></em>
             </li>
+            <li>
+                <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
+            </li>
         </ul>
     </div>
     <table class="table">