Merge branch 'main' into main2

648540858

2023-02-10 ec95a429859e2819772231e70dcd80cb976c81d2

1
2
3
-- 2.6.6->2.6.7
alter table device
    add keepaliveIntervalTime int default null;