Merge branch 'hotfix20180322manualsettle' into develop

src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java

@@ -20,7 +20,7 @@ public interface TaskManualSettleMapper {
     JSONObject findTodayTask(@Param("client_id") int clientId);
 
     @AutoSql(type = SqlType.SELECT)
-    @AdvanceSelect(addonWhereClause = "clearing_order is null")
+    @AdvanceSelect(addonWhereClause = "clearing_order is null or disable_flag=1")
     List<JSONObject> listActiveTasks(@Param("client_id") int clientId);
 
     @AutoSql(type = SqlType.INSERT)

src/main/resources/application.properties

@@ -22,9 +22,6 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.database=1
 
-spring.velocity.date-tool-attribute=date
-spring.velocity.number-tool-attribute=number
-
 mybatis.autosql.default-dialect=mysql
 
 app.redis.prefix=payment