Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -573,7 +573,7 @@
 								</div>
 							</div>
 							<div class="content">
-								<p class="title">价格梯度</p>
+								<p class="title">梯度/pcs</p>
 								<div class="input-list" ng-repeat="price in goods.prices">
 									<p>
 										<span><input ng-disabled="$index == 0" type="number" class="wid42 form-control"  placeholder="数量" ng-model="price.start" ng-blur="changePriceStart(goods, $index)" ng-pattern="/^[0-9]*$/"/></span>

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

@@ -579,7 +579,7 @@
                         <th width="220">产品信息</th>
                         <th width="115">包装/生产日期</th>
                         <th width="140">库存</th>
-                        <th width="105">数量</th>
+                        <th width="105">梯度/pcs</th>
                         <th ng-if="onsale.currency == 'USD'" width="116">单价<b style="font-size: 12px;font-weight: 600">($)</b></th>
                         <th ng-if="onsale.currency == 'RMB'" width="116">单价<b style="font-size: 12px;font-weight: 600">(￥)</b></th>
                         <th width="120">交期</th>

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

@@ -361,7 +361,7 @@
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
                                     <th width="150">产品固有属性</th>
                                     <th width="200">产品自定义属性</th>
-                                    <th width="100">数量</th>
+                                    <th width="100">梯度/pcs</th>
                                     <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
                                     <th width="70">操作</th>
                                 </tr>