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

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

@@ -1585,7 +1585,7 @@
 						</td>
 						<!--<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>-->
 						<td>
-							<span ng-bind="material.packaging || '-'" title="{{material.packaging || '-'}}"></span>
+							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
 						</td>
 						<td class="edit">
 							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>