diff --git a/src/db/modify.sql b/src/db/modify.sql
index bb65b475a..cef6741b5 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -45,9 +45,15 @@ ALTER TABLE `financial_bd_config`
ALTER TABLE `sys_client_bd`
MODIFY COLUMN `bd_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL AFTER `client_id`;
+ALTER TABLE `sys_client_bd`
+ MODIFY COLUMN `create_id` varchar(50) DEFAULT NULL FIRST ;
+
ALTER TABLE `sys_managers`
MODIFY COLUMN `manager_id` varchar(50) NOT NULL COMMENT '管理员账户编号' FIRST ;
+ALTER TABLE `sys_client_rates`
+ MODIFY COLUMN `manager_id` varchar(50) DEFAULT NULL FIRST ;
+
ALTER TABLE `log_manager_login`
MODIFY COLUMN `manager_id` varchar(50) NOT NULL AFTER `id`;
@@ -64,7 +70,10 @@ ALTER TABLE `bd_access_log`
MODIFY COLUMN `bd_id` varchar(50) NOT NULL AFTER `date`;
ALTER TABLE `sys_clients`
- MODIFY COLUMN `creator` varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`;
+ MODIFY COLUMN `creator` varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`,
+ MODIFY COLUMN `bd_user` varchar(300) DEFAULT NULL COMMENT '所属BD用户' AFTER `logo_thumbnail`,
+ MODIFY COLUMN `approver` varchar(50) DEFAULT NULL AFTER `logo_thumbnail`;
+
ALTER TABLE `pat_goods`
MODIFY COLUMN `creator` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `is_using`;
@@ -89,3 +98,13 @@ ALTER TABLE `pat_goods`
ALTER TABLE `pat_goods_sale`
MODIFY COLUMN `good_id` varchar(50) NOT NULL AFTER `client_id`;
+
+ALTER TABLE `commodities`
+ MODIFY COLUMN `create_id` varchar(50) DEFAULT NULL;
+
+ALTER TABLE `sys_accounts`
+ MODIFY COLUMN `creator` varchar(50) NOT NULL COMMENT '开户者';
+
+
+
+
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
index c2178f6cc..4606940d4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
@@ -78,8 +78,8 @@ public class AppQueryBean {
}
}
- params.put("status", status.toString());
- params.put("channel", channel.toString());
+ params.put("status", status.getStatus());
+ params.put("channel", channel.getChannels());
if (client_ids != null) {
params.put("client_ids", client_ids);
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
index 09d3c9f2a..59c92772c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
@@ -322,6 +322,7 @@ public class SignInController {
if (ua.toLowerCase().contains("royalpayclient")) {
response.sendRedirect("/api/v1.0/retail/app/partner_signin_app_qrcode/" + codeId);
}
+ System.err.println("The Wrong Browser's UA is :" + ua);
throw new ForbiddenException("error.not_support_browser");
}
}
diff --git a/src/main/resources/templates/mail/new_client_notice.html b/src/main/resources/templates/mail/new_client_notice.html
index 40f09882b..63f92795f 100644
--- a/src/main/resources/templates/mail/new_client_notice.html
+++ b/src/main/resources/templates/mail/new_client_notice.html
@@ -75,7 +75,7 @@
Email:
-
+