Merge branch 'master' of xwh/wms into master

wms-operate/src/main/resources/static/ui/views/inventory/inventory/inventory/list.html

@@ -79,8 +79,8 @@
 			</div>
 			
     		<a id="freeze" href="javascript:void(0)" style="width: 85px;">冻结</a>
-    		<a id="unFreeze" href="javascript:void(0)" style="width: 85px;">解冻</a>
-    		<a id="updInventory" href="javascript:void(0)">调整数量</a>
+    		<a id="unFreeze" href="javascript:void(0)" style="width: 85px;">解冻</a> 
+<!--    		<a id="updInventory" href="javascript:void(0)">调整数量</a>-->
     		<!-- 冻结库存的部分数量,通过设置冻结0,解开冻结 -->
     		<a id="freezeQty" href="javascript:void(0)">冻结数量</a>    		
     		<a id="setRemark" href="javascript:void(0)" style="width: 85px;">备注</a>