diff --git a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
index f686d411..476ff9b3 100644
--- a/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
+++ b/src/main/java/com/zzjee/wm/page/WmNoticeImpPage.java
@@ -9,12 +9,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**   
+/**
  * @Title: Entity
  * @Description: 导入
  * @author erzhongxmu
  * @date 2017-09-11 15:08:34
- * @version V1.0   
+ * @version V1.0
  *
  */
 public class WmNoticeImpPage implements java.io.Serializable {
@@ -68,10 +68,10 @@ public class WmNoticeImpPage implements java.io.Serializable {
 	/**进货通知单号*/
     @Excel(name="通知单号")
 	private String noticeId;
-	@Excel(name="合作伙伴编号")
+	@Excel(name="供应商编码")
 	private String supCode;
 	/**附件*/
-	@Excel(name="合作伙伴名称")
+	@Excel(name="供应商名称")
 	private String supName;
 	@Excel(name="其他系统ID")
 	private java.lang.String otherId;
diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java
index 9d33e53e..01f2734d 100644
--- a/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java
+++ b/src/main/java/org/jeecgframework/web/system/controller/core/UserController.java
@@ -94,7 +94,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 菜单列表
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -146,10 +146,10 @@ public class UserController extends BaseController {
 		}
 	}
 
-	
+
 	/**
 	 * 用户列表页面跳转
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "user")
@@ -163,7 +163,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户信息
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "userinfo")
@@ -175,7 +175,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 修改密码
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "changepassword")
@@ -184,12 +184,12 @@ public class UserController extends BaseController {
 		request.setAttribute("user", user);
 		return "system/user/changepassword";
 	}
-	
-	
+
+
 
 	/**
 	 * 修改密码
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "savenewpwd")
@@ -218,14 +218,14 @@ public class UserController extends BaseController {
 		}
 		return j;
 	}
-	
+
 
 	/**
-	 * 
+	 *
 	 * 修改用户密码
 	 * @author Chj
 	 */
-	
+
 	@RequestMapping(params = "changepasswordforuser")
 	public ModelAndView changepasswordforuser(TSUser user, HttpServletRequest req) {
 		if (StringUtil.isNotEmpty(user.getId())) {
@@ -236,9 +236,9 @@ public class UserController extends BaseController {
 		}
 		return new ModelAndView("system/user/adminchangepwd");
 	}
-	
-	
-	
+
+
+
 	/**
 	 * 重置密码
 	 * @param req
@@ -260,19 +260,19 @@ public class UserController extends BaseController {
 			users.setPassword(PasswordUtil.encrypt(users.getUserName(), password, PasswordUtil.getStaticSalt()));
 			users.setStatus(Globals.User_Normal);
 			users.setActivitiSync(users.getActivitiSync());
-			systemService.updateEntitie(users);	
+			systemService.updateEntitie(users);
 			message = "用户: " + users.getUserName() + "密码重置成功";
 			systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
-		} 
-		
+		}
+
 		j.setMsg(message);
 
 		return j;
 	}
 	/**
 	 * 锁定账户
-	
-	 * 
+
+	 *
 	 * @author pu.chen
 	 */
 	@RequestMapping(params = "lock")
@@ -303,11 +303,11 @@ public class UserController extends BaseController {
 		j.setMsg(message);
 		return j;
 	}
-	
+
 
 	/**
 	 * 得到角色列表
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "role")
@@ -335,7 +335,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 得到部门列表
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "depart")
@@ -362,7 +362,7 @@ public class UserController extends BaseController {
 	}
 
 	/**
-	 * easyuiAJAX用户列表请求数据 
+	 * easyuiAJAX用户列表请求数据
 	 * @param request
 	 * @param response
 	 * @param dataGrid
@@ -373,9 +373,9 @@ public class UserController extends BaseController {
         //查询条件组装器
         org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, user);
 
-        Short[] userstate = new Short[]{Globals.User_Normal, Globals.User_ADMIN, Globals.User_Forbidden};
-        cq.in("status", userstate);
-        cq.eq("deleteFlag", Globals.Delete_Normal);
+//        Short[] userstate = new Short[]{Globals.User_Normal, Globals.User_ADMIN, Globals.User_Forbidden};
+//        cq.in("status", userstate);
+//        cq.eq("deleteFlag", Globals.Delete_Normal);
 
         String orgIds = request.getParameter("orgIds");
         List<String> orgIdList = extractIdListByComma(orgIds);
@@ -417,35 +417,35 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户删除选择对话框
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "deleteDialog")
 	public String deleteDialog(TSUser user,HttpServletRequest request) {
 		request.setAttribute("user", user);
 		return "system/user/user-delete";
-	} 
-	
+	}
+
 	@RequestMapping(params = "delete")
 	@ResponseBody
 	public AjaxJson delete(TSUser user, @RequestParam String deleteType, HttpServletRequest req) {
-		
+
 		if (deleteType.equals("delete")) {
 			return this.del(user, req);
 		}else if (deleteType.equals("deleteTrue")) {
 			return this.trueDel(user, req);
 		}else{
 			AjaxJson j = new AjaxJson();
-			
+
 			j.setMsg("删除逻辑参数异常,请重试.");
 			return j;
 		}
 	}
 
-	
+
 	/**
 	 * 用户信息录入和更新
-	 * 
+	 *
 	 * @param user
 	 * @param req
 	 * @return
@@ -468,7 +468,7 @@ public class UserController extends BaseController {
 			userService.updateEntitie(user);
 			message = "用户：" + user.getUserName() + "删除成功";
 
-			
+
 /**
 			if (roleUser.size()>0) {
 				// 删除用户时先删除用户和角色关系表
@@ -483,7 +483,7 @@ public class UserController extends BaseController {
 				userService.delete(user);
 				message = "用户：" + user.getUserName() + "删除成功";
 			}
-**/	
+**/
 		} else {
 			message = "超级管理员不可删除";
 		}
@@ -491,7 +491,7 @@ public class UserController extends BaseController {
 		j.setMsg(message);
 		return j;
 	}
-	
+
 	/**
 	 * 真实删除
 	 * @param user
@@ -526,7 +526,7 @@ public class UserController extends BaseController {
 		} else {
 			message = "超级管理员不可删除";
 		}*/
-		
+
 		try {
 			message = userService.trueDel(user);
 		} catch (Exception e) {
@@ -550,7 +550,7 @@ public class UserController extends BaseController {
 	}*/
 	/**
 	 * 检查用户名
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -571,7 +571,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户录入
-	 * 
+	 *
 	 * @param user
 	 * @param req
 	 * @return
@@ -673,7 +673,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户选择角色跳转页面
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "roles")
@@ -687,7 +687,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 角色显示列表
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param dataGrid
@@ -703,7 +703,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * easyuiAJAX请求数据： 用户选择角色列表
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param dataGrid
@@ -725,7 +725,7 @@ public class UserController extends BaseController {
         TSDepart tsDepart = new TSDepart();
 		if (StringUtil.isNotEmpty(user.getId())) {
 			user = systemService.getEntity(TSUser.class, user.getId());
-			
+
 			req.setAttribute("user", user);
 			idandname(req, user);
 			getOrgInfos(req, user);
@@ -774,7 +774,7 @@ public class UserController extends BaseController {
 		req.setAttribute("roleName", roleName);
 
 	}
-	
+
 	public void getOrgInfos(HttpServletRequest req, TSUser user) {
 		List<TSUserOrg> tSUserOrgs = systemService.findByProperty(TSUserOrg.class, "tsUser.id", user.getId());
 		String orgIds = "";
@@ -789,7 +789,7 @@ public class UserController extends BaseController {
 		req.setAttribute("departname", departname);
 
 	}
-	
+
 	/**
 	 * 根据部门和角色选择用户跳转页面
 	 */
@@ -802,7 +802,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 部门和角色选择用户的panel跳转页面
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -817,7 +817,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 部门和角色选择用户的用户显示列表
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param dataGrid
@@ -858,7 +858,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 部门和角色选择用户的panel跳转页面
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -876,7 +876,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 部门和角色选择用户的用户显示列表
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param dataGrid
@@ -890,7 +890,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 测试
-	 * 
+	 *
 	 * @param user
 	 * @param req
 	 * @return
@@ -911,7 +911,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户列表页面跳转
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "index")
@@ -921,7 +921,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户列表页面跳转
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "main")
@@ -931,7 +931,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 测试
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(params = "testpage")
@@ -941,7 +941,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 设置签名跳转页面
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -954,7 +954,7 @@ public class UserController extends BaseController {
 
 	/**
 	 * 用户录入
-	 * 
+	 *
 	 * @param user
 	 * @param req
 	 * @return
@@ -1030,7 +1030,7 @@ public class UserController extends BaseController {
 	* @Title: saveStyle
 	* @Description: 修改首页样式
 	* @param request
-	* @return AjaxJson    
+	* @return AjaxJson
 	* @throws
 	 */
 	@RequestMapping(params = "savestyle")
@@ -1061,7 +1061,7 @@ public class UserController extends BaseController {
 //				logger.info("cssTheme:default");
 //			}
 
-			
+
 			if(StringUtils.isNotEmpty(indexStyle)){
 				Cookie cookie = new Cookie("JEECGINDEXSTYLE", indexStyle);
 				//设置cookie有效期为一个月
@@ -1289,4 +1289,4 @@ public class UserController extends BaseController {
 	public String userSelect() {
 		return "system/user/userSelect";
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdCusList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdCusList.jsp
index c8d4e539..1a3d22c2 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdCusList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdCusList.jsp
@@ -57,10 +57,10 @@
     <t:dgCol title="注册日期"  field="zhuCeRiQi" formatter="yyyy-MM-dd" hidden="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="备注"  field="beiZhu"    queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="操作" field="opt" width="100"></t:dgCol>
-    <t:dgDelOpt title="删除" operationCode="mdcusdel" url="mdCusController.do?doDel&id={id}" urlclass="ace_button"  urlfont="fa-trash-o"/>
+    <t:dgDelOpt title="删除"   url="mdCusController.do?doDel&id={id}" urlclass="ace_button"  urlfont="fa-trash-o"/>
    <t:dgToolBar title="录入" height="600" icon="icon-add" url="mdCusController.do?goAdd" funname="add"></t:dgToolBar>
-   <t:dgToolBar title="编辑" height="600"  icon="icon-edit" operationCode="mdcusedit" url="mdCusController.do?goUpdate" funname="update"></t:dgToolBar>
-<%--    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdCusController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
+   <t:dgToolBar title="编辑" height="600"  icon="icon-edit"  url="mdCusController.do?goUpdate" funname="update"></t:dgToolBar>
+    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdCusController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar>
    <t:dgToolBar title="查看" height="600" icon="icon-search" url="mdCusController.do?goUpdate" funname="detail"></t:dgToolBar>
    <t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar>
    <t:dgToolBar title="导出" icon="icon-putout" funname="ExportXls"></t:dgToolBar>
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdSupList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdSupList.jsp
index 797ccc9d..6865913a 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdSupList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdSupList.jsp
@@ -58,7 +58,7 @@
     <t:dgDelOpt title="删除" url="mdSupController.do?doDel&id={id}" urlclass="ace_button"  urlfont="fa-trash-o"/>
    <t:dgToolBar title="录入" icon="icon-add" url="mdSupController.do?goAdd" funname="add"></t:dgToolBar>
    <t:dgToolBar title="编辑" icon="icon-edit" url="mdSupController.do?goUpdate" funname="update"></t:dgToolBar>
-<%--    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdSupController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
+    <t:dgToolBar title="批量删除"  icon="icon-remove" url="mdSupController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar>
    <t:dgToolBar title="查看" icon="icon-search" url="mdSupController.do?goUpdate" funname="detail"></t:dgToolBar>
     <t:dgToolBar operationCode="uasimpcus" title="第三方系统导入" icon="icon-put" funname="otherimp"></t:dgToolBar>