Merge branch 'develop'

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>

src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java

@@ -1,14 +1,11 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.alibaba.fastjson.JSONObject;
 import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
 import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
 import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
-import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * Created by davep on 2016-07-22.
  */
@@ -21,10 +18,6 @@ public interface GatewayClientApplyNotifyLogMapper {
     @AutoSql(SqlType.UPDATE)
     void update(JSONObject notice);
 
-    @AutoSql(SqlType.SELECT)
-    @AdvanceSelect(addonWhereClause = "success=0 and addtime(`addtime`,'24:00:00')>now()")
-    List<JSONObject> listErrorLogsIn24Hour();
-
     @AutoSql(SqlType.SELECT)
     JSONObject findHistoryByClientId(@Param("client_id") int clientId);
 }

src/main/ui/static/analysis/templates/dialog_holiday_config.html

@@ -1,9 +1,10 @@
-<div class="modal-header">Holiday Config: {{holiday.holiday}}</div>
+<div class="modal-header">Holiday Config: {{holiday.holiday|date:'yyyy-MM-dd'}}</div>
 <div class="modal-body">
     <div class="row">
         <div class="col-md-12">
             <div class="form-group">
-                <input title="Description" placeholder="Description" ng-model="holiday.description">
+                <input title="Description" class="form-control" placeholder="Description"
+                       ng-model="holiday.description">
             </div>
         </div>
     </div>

src/main/ui/static/analysis/templates/settle_date_config.html

@@ -12,7 +12,7 @@
                 <div class="col-xs-12">
                     <div royal-calendar month-change="loadMonthPlan($month)">
                         <div class="rc-full" style="color: green" ng-click="configHoliday(day)">
-                            <dl ng-init="holiday=getHoliday(day)" ng-if="holiday!=null">
+                            <dl ng-init="holiday=getHoliday(day)" ng-show="holiday!=null">
                                 <dt ng-bind="holiday.description"></dt>
                                 <dd>
                                     <span class="label label-success" ng-repeat="region in holiday.regions"