From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/webapp/WEB-INF/spring-menu.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/WEB-INF/spring-menu.xml b/src/main/webapp/WEB-INF/spring-menu.xml
index 460ae42..ed59289 100644
--- a/src/main/webapp/WEB-INF/spring-menu.xml
+++ b/src/main/webapp/WEB-INF/spring-menu.xml
@@ -153,6 +153,15 @@
         </bean>
 
         <bean class="com.nanometer.smartlab.model.MenuModel">
+            <property name="id" value="order_input_warehouse"></property>
+            <property name="title" value="仓库订单领用"></property>
+            <property name="page" value="order_input_warehouse"></property>
+            <property name="dispInMenuList" value="false"></property>
+            <property name="initClazz" value="warehouseStockMngController"></property>
+            <property name="initMethod" value="initInputWarehouse"></property>
+        </bean>
+
+        <bean class="com.nanometer.smartlab.model.MenuModel">
             <property name="id" value="warehouse_reagent_direct_store"></property>
             <property name="title" value="试剂直接入库"></property>
             <property name="page" value="warehouse_reagent_direct_store"></property>
@@ -163,6 +172,22 @@
 
         <bean class="com.nanometer.smartlab.model.MenuModel">
             <property name="id" value="base_info_mng"></property>
+            <property name="title" value="危废处理"></property>
+            <property name="icon" value="icon_sidebar1"></property>
+            <property name="subMenu">
+                <list value-type="com.nanometer.smartlab.model.MenuModel">
+                    <bean class="com.nanometer.smartlab.model.MenuModel">
+                        <property name="id" value="sys_hazardous_waste"></property>
+                        <property name="title" value="危废处理信息"></property>
+                        <property name="page" value="sys_hazardous_waste"></property>
+                        <property name="privilegeCode" value="sys_hazardous_waste"></property>
+                    </bean>
+                </list>
+            </property>
+        </bean>
+
+        <bean class="com.nanometer.smartlab.model.MenuModel">
+            <property name="id" value="base_info_mng"></property>
             <property name="title" value="基本信息管理"></property>
             <property name="icon" value="icon_sidebar3"></property>
             <property name="subMenu">

--
Gitblit v1.9.2