1. Modify excel generator to use the year of first data instead of permanent 2018.

Add checkShockPoint function to judge whether current point is a shock point instead of equal time only.

Modify to return "endCircuit" when checking the circuitState is 2 in updateEndTime interface.

See merge request !5

Tdl bosch carit

See merge request !4

1. Add tdlname for binding() interface in EquipmentBindingController.
2. Add gatewayName for addGateway() interface in WarehouseController.
3. Modify the Stored Procedure of pro_warehouseAddGateway and pro_addTDLGatewayLog to modify the name of gateway and tdl.

Add gateway name for WarehouseLogVo and GatewayOnLineVo, and add TDL name for TDLDeviceVo and TDLDeviceDetailVo which will be returned by getDetails interface in WarehouseController.

Add offset != null judgement for saveAlarmRule

See merge request !3

Update SQL of addTDLDevice function to appoint column name for inserting TDLDevice data.

See merge request !2

Merge Tdl_bosch_offset into Tdl_bosch

See merge request !1

Add getWarehouseAlarm interface for AlarmLogController and modify to realize paging for getAlarm and getWarehouseAlarm.

# Conflicts:
#	src/main/resources/application.properties