Merge remote-tracking branch 'origin/master'

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);

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});
         }