From f6899534794ce89b396f58ebd28c18c9585a5ee3 Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 28 Aug 2018 11:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9settle=5Fhour=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/entity/impls/SettleHourModify.java | 2 +- src/main/ui/static/payment/partner/partner-manage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java index ba474a4eb..8951f5294 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONObject; * Create by yixian at 2018-04-12 16:43 */ public class SettleHourModify extends ClientConfigModify { - private int settle_hour; + private Integer settle_hour; public SettleHourModify(JSONObject account, String clientMoniker, Integer settle_hour) { super(account, clientMoniker); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 0084d5263..a8bfba833 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1728,7 +1728,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.getBankAccount(); }) }; - $scope.settleHours = [{value: 24, label: 'Default(24:00, GMT+10)'}]; + $scope.settleHours = [{value: undefined, label: 'Default(24:00, GMT+10)'}]; for (var h = 24; h > 0; h--) { $scope.settleHours.push({value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone}); }