Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfClearAmountServiceImpl.java

@@ -22,8 +22,8 @@ public class HfClearAmountServiceImpl implements HfClearAmountService {
     public JSONObject hfjsonobject(String dateto, String datefrom) {
         JSONObject params = new JSONObject();
         try {
-            params.put("datefrom", DateUtils.addMinutes(DateUtils.parseDate(datefrom), PlatformEnvironment.getEnv().getTimeZoneOffsetMinutes()));
-            params.put("dateto", DateUtils.addMinutes(DateUtils.parseDate(dateto), PlatformEnvironment.getEnv().getTimeZoneOffsetMinutes()));
+            params.put("datefrom", DateUtils.addMinutes(DateUtils.parseDate(datefrom, "yyyy-MM-dd"), PlatformEnvironment.getEnv().getTimeZoneOffsetMinutes()));
+            params.put("dateto", DateUtils.addMinutes(DateUtils.parseDate(dateto, "yyyy-MM-dd"), PlatformEnvironment.getEnv().getTimeZoneOffsetMinutes()));
         } catch (ParseException e) {
             throw new ServerErrorException("时间转换异常");
         }