Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-25 db523e0fdf7801cdc01f10886f2c9aec04e711bb

 src/main/webapp/WEB-INF/spring-menu.xml

@@ -269,6 +269,8 @@
                        <property name="title" value="人员管理"></property>
                        <property name="page" value="user_mng"></property>
                        <property name="privilegeCode" value="user_mng"></property>
                        <property name="initClazz" value="userMngController"></property>
                        <property name="initMethod" value="initPage"></property>
                    </bean>
                    <bean class="com.nanometer.smartlab.model.MenuModel">
                        <property name="id" value="role_mng"></property>