Merge branch 'master' into 'frontend'

# Conflicts:
#   src/biz/strategies/right/getEventCountByYearStrategy.ts

src/biz/strategies/right/abstractDataStrategyRight.ts

@@ -6,6 +6,7 @@
 import { dataStrategy } from "../dataStrategy";
 import { DataExtractor } from "../../../util/dataExtractor";
 import excelSerialToJSDate from "../../../util/excelDateToJSDate";
+import moment = require("moment");
 
 /**
  * 抽象数据策略右侧类，所有右侧具体策略类都需要继承该抽象类。

src/biz/strategies/right/getEventCountByYearStrategy.ts

@@ -5,6 +5,7 @@
 
 import { abstractDataStrategyRight } from "./abstractDataStrategyRight";
 import excelSerialToJSDate from "../../../util/excelDateToJSDate";
+import moment = require("moment");
 
 /**
  * 按年统计事件数量策略类，继承自 abstractDataStrategyRight。