Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-06-02 65f8440525654842e748d1840be61cca9f0417e2

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java

@@ -1,4 +1,4 @@
package cn.gistack.alerts.alarmRule.notice.constant;
package cn.gistack.alerts.notice.constant;

import java.util.ArrayList;
import java.util.List;