Authored by 张帅

Merge branch 'dev_grass_20190108' into test6.8.6

... ... @@ -23,8 +23,8 @@
</style>
</head>
<body class="easyui-layout" >
<div region="north" style="height: 200px;">
<body class="easyui-layout" fit="true" style="overflow-y: scroll" >
<div region="north" style="height: 20%;">
<script>
document.write(addHead('种草管理', '内容管理'));
</script>
... ... @@ -51,8 +51,8 @@
</div></div>
<div region="center" id="activityList" style="margin-left: 20px">
<table id="activityListTable"></table>
<div region="center" id="activityList" style="margin-left: 20px" >
<table id="activityListTable" ></table>
</div>
</body>
... ...