Merge branch 'pre' into 'master'

defaultValue

See merge request !80

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

@@ -84,7 +84,7 @@ public class KylinPerformancesController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "type为1的时候合并巡演")
     })
-    public ResponseDto<HashMap<String, Object>> noticeList(@RequestParam Integer type) {
+    public ResponseDto<HashMap<String, Object>> noticeList(@RequestParam(defaultValue = "") Integer type) {
         HashMap<String, Object> result = kylinPerformancesService.noticeList(type);
         return ResponseDto.success(result);
     }