Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/platform/b2c/prod/product/component/modal/Component.java

@@ -87,7 +87,8 @@ public class Component implements Serializable {
 	/**
 	 * 规格信息
 	 */
-	@Column(name = "cmp_spec")
+//	@Column(name = "cmp_spec")
+	@Transient
 	private String spec;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentInfo.java

@@ -207,7 +207,8 @@ public class ComponentInfo implements Serializable {
 	/**
 	 * 规格信息
 	 */
-	@Column(name = "cmp_spec")
+//	@Column(name = "cmp_spec")
+	@Transient
 	private String spec;
 
 	/**

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -9,7 +9,7 @@ define(['app/app'], function (app) {
           $scope.seekPurchaseRate = {};
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
-            seekUrl = 'http://218.17.158.219:24000';
+            // seekUrl = 'http://218.17.158.219:24000';
           $scope.initInquiryItem = function () {
             $scope.validSayPrice = {
               leadtime: false,

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -824,7 +824,7 @@
                             <div class="il-box-small il-box">
                                 <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>-->
                                 <!--<div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->
-                                <div title="{{seek.needquantity}}" class="item">{{seek.needquantity || '-'}}</div>
+                                <div title="{{seek.needQty || seek.needquantity}}" class="item">{{seek.needQty || seek.needquantity || '-'}}</div>
                                 <!--<div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算：</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>-->
                             </div>
                         </div>