Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/maintain

src/main/java/com/chelvc/cloud/maintain/controller/CurrencyRecordController.java

@@ -1,5 +1,7 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 
@@ -32,8 +34,8 @@ public class CurrencyRecordController {
      * @param type 类型：0-平台；1-用户；2-商户
      */
     @GetMapping("/listCurrencyRecord")
-    public List<CurrencyRecordDTO> listCurrencyRecord(@NotNull(message = "查询类型不能为空") Integer type) {
-        return this.currencyRecordClient.listCurrencyRecord(type);
+    public List<CurrencyRecordDTO> listCurrencyRecord(@NotNull(message = "查询类型不能为空") Integer type, LocalDate date) {
+        return this.currencyRecordClient.listCurrencyRecord(type,date);
     }
 
     /**