Merge branch '1.0' of 192.168.2.80:/srv/git/pre_parameter into 1.0

# Conflicts:
#	cbkj_web_parameter/src/main/java/com/jiuzhekan/cbkj/service/parameter/smartPrescrib/ToolbarService.java

cbkj_web_parameter/src/main/resources/mappers/sysMappers/AdminMenuMapper.xml

@@ -75,7 +75,11 @@
         where m.menu_id = rm.menu_id
           and rm.role_id = ur.role_id
           and ur.user_id = #{uid}
-          and m.status ='1' and m.menu_type in (1,2)
+          and m.status ='1' and m.menu_type in
+        <foreach collection="menuTypes.split(',')" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+
         <if test="parentMenuId != null">
             and m.parent_menu_id = #{parentMenuId}
         </if>