From d2ef9d0c255d75a794a5fdb19580c52f02afdf59 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Tue, 13 Mar 2018 17:39:53 +0800
Subject: [PATCH] Merge branch 'master' of
 /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.

---
 src/db/modify.sql | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 92a26216e..8ae0ab0dd 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -239,22 +239,5 @@ ALTER TABLE `financial_bd_prize_log`
   MODIFY COLUMN `manager_id`  varchar(50) NOT NULL COMMENT 'bd user id' AFTER `record_id`;
 
 
-
-
-
-ALTER TABLE sys_files DROP INDEX UK_sys_files;
-
-create table sys_clients_contract(
-id varchar(50) not null,
-client_id int(11) not null,
-create_time datetime not null,
-expiry_date date not null,
-has_sign TINYINT(1) DEFAULT 0 not null,
-sign_channel varchar(10) not null ,
-sign_account_id varchar(50) DEFAULT null,
-signatory varchar(20) DEFAULT null,
-PRIMARY key (`id`)
-);
-
-
-alter table sys_clients_devices add column is_offline  tinyint(1) NOT NULL DEFAULT '0';
\ No newline at end of file
+alter table sys_notice
+	add is_app_window tinyint default '0' null comment '是否需要APP弹框';
\ No newline at end of file