Merge remote-tracking branch 'origin/release-201837-wangcz' into release-201837-wangcz

src/main/webapp/resources/view/usercenter/forstore/buyer_material.html

@@ -1098,7 +1098,7 @@
 				<div class="check" style="margin-left: 12px;color: #666; font-size: 14px;margin-top: 20px;">
 					更多操作：
 					<div class="operate-btn" ng-click="setAllInPerson($event)" ng-if="chooseTypePeople === 'all'"><span>加入我的产品库</span></div>
-					<!--<div class="operate-btn" ng-click="sendGoodsCome()"><span>入库</span></div>-->
+					<div class="operate-btn" ng-click="sendGoodsCome()"><span>入库</span></div>
 					<!--<div class="operate-btn" ng-click="sendGoodsOut()"><span>出库</span></div>-->
 					<!--<div class="operate-btn" ng-click="download($event)"><span>导出选中</span></div>-->
 					<!--<div class="operate-btn" ng-click="modifyBatch($event)"><span>批量修改</span></div>-->

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

@@ -1098,7 +1098,7 @@
 				<div class="check" style="margin-left: 12px;color: #666; font-size: 14px;margin-top: 20px;">
 					更多操作：
 					<div class="operate-btn" ng-click="setAllInPerson($event)" ng-if="chooseTypePeople === 'all'"><span>加入我的产品库</span></div>
-					<div class="operate-btn" ng-click="sendGoodsCome()"><span>入库</span></div>
+					<!--<div class="operate-btn" ng-click="sendGoodsCome()"><span>入库</span></div>-->
 					<div class="operate-btn" ng-click="sendGoodsOut()"><span>出库</span></div>
 					<div class="operate-btn" ng-click="download($event)"><span>导出选中</span></div>
 					<div class="operate-btn" ng-click="modifyBatch($event)"><span>批量修改</span></div>