From 12411953d232db4c9be5e26d411eaa21ae51f589 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Tue, 18 Sep 2018 22:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=80=9A=E7=9F=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zzjee/wm/controller/WmOmNoticeHController.java | 6 +++---
 src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
index c94a012e..e13c0408 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
@@ -162,7 +162,7 @@ public class WmOmNoticeHController extends BaseController {
 		}
 
 		Map<String,Object> map1 = new HashMap<String,Object>();
-		map1.put("omNoticeId", "desc");
+		map1.put("createDate", "desc");
 		cq.setOrder(map1);
 		cq.add();
 		this.wmOmNoticeHService.getDataGridReturn(cq, true);
@@ -370,7 +370,7 @@ public class WmOmNoticeHController extends BaseController {
 //		map2.put("omSta", "asc");
 //		cq.setOrder(map2);
 		Map<String,Object> map1 = new HashMap<String,Object>();
-		map1.put("omNoticeId", "desc");
+		map1.put("createDate", "desc");
 		cq.setOrder(map1);
 
 		cq.add();
@@ -414,7 +414,7 @@ public class WmOmNoticeHController extends BaseController {
 //		map2.put("omSta", "asc");
 //		cq.setOrder(map2);
 		Map<String,Object> map1 = new HashMap<String,Object>();
-		map1.put("omNoticeId", "desc");
+		map1.put("createDate", "desc");
 		cq.setOrder(map1);
 //		cq.like("omNoticeId", "CK%");
 		cq.add();
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
index f2f1ea0b..3e5039c5 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeitemList.jsp
@@ -3,7 +3,7 @@
 <t:base type="jquery,easyui,tools,DatePicker,autocomplete"></t:base>
 <div class="easyui-layout" fit="true">
   <div region="center" style="padding:0px;border:0px">
-  <t:datagrid name="wmOmNoticeitemList"  checkbox="true" pagination="true" fitColumns="true"
+  <t:datagrid name="wmOmNoticeitemList"  checkbox="true" pagination="true" fitColumns="false"
   title="出库通知调整" actionUrl="wmOmNoticeHController.do?datagriditem" idField="id"  queryMode="group">
  <t:dgCol title="主键"  field="id"  hidden="true"  queryMode="single"  width="120"></t:dgCol>
     <t:dgCol title="创建人"  field="createName"     queryMode="single"  width="80"></t:dgCol>