From 5e812e933ffab7ed81d8ad7cda254baaf26992cc Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Tue, 17 Jul 2018 14:37:07 +0800
Subject: [PATCH] fix attention merchants

---
 src/db/modify.sql                                           | 6 ++----
 .../manage/mappers/risk/RiskAttentionMerchantsAMapper.java  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index b2d6c735c..b5b1a885c 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -662,13 +662,11 @@ CREATE TABLE `act_charity` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `risk_attention_merchants` (
-  `id` varchar(50) NOT NULL,
   `client_id` int(11) NOT NULL,
   `client_moniker` varchar(20) NOT NULL,
   `is_valid` tinyint(1) NOT NULL DEFAULT 1,
   `create_time` datetime NOT NULL,
   `update_time` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `client_moniker` (`client_moniker`),
-  KEY `id` (`id`)
+  PRIMARY KEY (`client_id`),
+  KEY `client_moniker` (`client_moniker`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
index 57ef0030a..46f817c70 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * Create by yixian at 2017-12-21 11:45
  */
-@AutoMapper(tablename = "risk_attention_merchants", pkName = "id")
+@AutoMapper(tablename = "risk_attention_merchants", pkName = "client_id")
 public interface RiskAttentionMerchantsAMapper {
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject client);