diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 4858c9f..fd2ec3f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -7,8 +7,11 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:oracle:thin:@124.70.0.226:1521:ORCL
+#                url: jdbc:oracle:thin:@10.100.71.101:1521:ORCL
 
+#                username: aucma
                 username: system
+#                password: aucma
                 password: 123456
             # 从库数据源
             slave:
diff --git a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
index a07c94c..53f358b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
@@ -44,6 +44,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:basestoreinfo:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
+                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:baselocationinfo:import">
+                    <i class="fa fa-upload"></i> 导入
+                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:basestoreinfo:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -125,5 +128,21 @@
             $.table.init(options);
         });
     </script>
+
+     <!-- 导入区域 -->
+     <script id="importTpl" type="text/template">
+         <form enctype="multipart/form-data" class="mt20 mb10">
+             <div class="col-xs-offset-1">
+                 <input type="file" id="file" name="file"/>
+                 <div class="mt10 pt5">
+                     <input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
+                     &nbsp;	<a onclick="$.table.importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
+                 </div>
+                 <font color="red" class="pull-left mt10">
+                     提示：仅允许导入“xls”或“xlsx”格式文件！
+                 </font>
+             </div>
+         </form>
+     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index d73783c..a6c0835 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -26,15 +26,15 @@
 
 	<sql id="selectMenuVo">
         select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, nvl(perms,'') as perms, icon, create_by, create_time
-		from sys_menu
+		from sys_menu_wms
     </sql>
 
 	<select id="selectMenusByUserId" parameterType="Long" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu_wms m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
 			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
-			 LEFT JOIN sys_role_wms ro on ur.role_id = ro.role_id
+			 LEFT JOIN sys_role_wms_wms ro on ur.role_id = ro.role_id
 		where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
@@ -54,7 +54,7 @@
 	<select id="selectMenuAllByUserId" parameterType="Long" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu_wms m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
 			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
 			 LEFT JOIN sys_role_wms ro on ur.role_id = ro.role_id
 		where ur.user_id = #{userId}
@@ -64,7 +64,7 @@
 	<select id="selectPermsByUserId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu_wms m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
 			 left join sys_user_role_wms ur on rm.role_id = ur.role_id
 			 left join sys_role_wms r on r.role_id = ur.role_id
 		where m.visible = '0' and r.status = '0' and ur.user_id = #{userId}
@@ -73,7 +73,7 @@
 	<select id="selectMenuTree" parameterType="Long" resultType="String">
 		select concat(m.menu_id, nvl(m.perms,'')) as perms
 		from sys_menu_wms m
-			left join sys_role_menu rm on m.menu_id = rm.menu_id
+			left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
 		where rm.role_id = #{roleId}
 		order by m.parent_id, m.order_num
 	</select>
@@ -94,7 +94,7 @@
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, nvl(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu_wms m
-		left join sys_role_menu rm on m.menu_id = rm.menu_id
+		left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
 		left join sys_user_role_wms ur on rm.role_id = ur.role_id
 		LEFT JOIN sys_role_wms ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 8de207b..1c32dcb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
 		SELECT p.post_id, p.post_name, p.post_code
-		FROM sys_user u
+		FROM sys_user_wms u
 			 LEFT JOIN sys_user_post up ON u.user_id = up.user_id
 			 LEFT JOIN sys_post_wms p ON up.post_id = p.post_id
 		WHERE up.user_id = #{userId}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index c832b20..4a15bdb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope,
             r.status, r.del_flag, r.create_time, r.remark 
         from sys_role_wms r
-	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
+	        left join sys_user_role_wms ur on ur.role_id = r.role_id
+	        left join sys_user_wms u on u.user_id = ur.user_id
+	        left join sys_dept_wms d on u.dept_id = d.dept_id
     </sql>
     
     <sql id="selectRoleVo">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index 2128c0d..8c2b8b1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -10,15 +10,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
-		delete from sys_role_menu where role_id=#{roleId}
+		delete from SYS_ROLE_MENU_WMS where role_id=#{roleId}
 	</delete>
 	
 	<select id="selectCountRoleMenuByMenuId" resultType="Integer">
-	    select count(1) from sys_role_menu where menu_id=#{menuId}  
+	    select count(1) from SYS_ROLE_MENU_WMS where menu_id=#{menuId}
 	</select>
 	
 	<delete id="deleteRoleMenu" parameterType="Long">
- 		delete from sys_role_menu where role_id in
+ 		delete from SYS_ROLE_MENU_WMS where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
         </foreach> 
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="batchRoleMenu" useGeneratedKeys="false">
 		insert all
 		<foreach item="item" index="index" collection="list">
-			into sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId})
+			into SYS_ROLE_MENU_WMS(role_id, menu_id) values (#{item.roleId},#{item.menuId})
 		</foreach>
 		SELECT 1 FROM DUAL
 	</insert>