Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -102,7 +102,7 @@ public class AssetController extends BaseController {
 
     @GetMapping("/tokenHistory")
     @ApiOperation("交易历史")
-    public List<TokenHistory> tokenHistory(@RequestParam String tokenId, @RequestParam Long assetId) {
+    public List<TokenHistory> tokenHistory(@RequestParam(required = false) String tokenId, @RequestParam(required = false) Long assetId) {
         return assetService.tokenHistory(tokenId, assetId);
     }