Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 1a29dddd0d
parent 110d88d76f ee8a954566
commit 1a29dddd0d
2 changed files with 4 additions and 1 deletions
--- a/Application/Admin/View/Member/chax.html
+++ b/Application/Admin/View/Member/chax.html
@ -19,7 +19,7 @@
        padding: 0px;
    }
 </style>
-<body>
+<body style="overflow-y: scroll;height:100%">
 <div id="main" class="main" style="min-height: 342px;width: 92%;">
    <div class="cf">
--- a/Data/update.sql
+++ b/Data/update.sql
@ -392,3 +392,6 @@ CREATE TABLE `tab_promote_coin_transfer_log` (
  `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ALTER TABLE `tab_downloadlog`
 	CHANGE COLUMN `conditions` `conditions` VARCHAR(20480) NULL DEFAULT '[]' COMMENT '下载筛选条件' AFTER `content`;