master #6

Merged
bichangxiong merged 8 commits from master into prod 2025-09-08 18:51:12 +08:00

8 Commits

Author SHA1 Message Date
64ec07d7b2 更新 pom.xml 2025-09-08 18:50:21 +08:00
lxj
ad36d4cfd5 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-08 17:50:16 +08:00
lxj
ba206c4d32 修复时间上报 2025-09-08 17:50:05 +08:00
d598409b28 Merge remote-tracking branch 'origin/master' 2025-09-08 17:48:18 +08:00
6a2898e0d7 feat(Property): 优化定时任务执行逻辑并添加时间限制 2025-09-08 17:48:10 +08:00
9a6bd54fba 新增客户服务活动功能 2025-09-08 16:41:32 +08:00
15683799673
71c82fa345 处理查询当前告警数量为0 2025-09-08 01:44:27 +08:00
15683799673
68abebc90f 修复设备同步状态异常 2025-09-07 09:07:57 +08:00