Commit Graph

549 Commits

Author SHA1 Message Date
dy
87b77b26d1 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m22s
2025-08-23 22:55:22 +08:00
dy
0584a44601 H5新增访客 2025-08-23 22:55:11 +08:00
15683799673
18bd1724c4 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-23 19:53:54 +08:00
15683799673
c8475f818d 修复告警详情图片获取不对的问题 2025-08-23 19:53:46 +08:00
d3a1d16b8f 修改了物业一些bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-23 19:17:29 +08:00
5ec2a67049 新增了单位接口
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-23 16:36:45 +08:00
9eeca6f32e 新增了单位接口
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m55s
2025-08-23 15:27:13 +08:00
8966b52cc5 修改了移动端新增工单
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 8m6s
2025-08-23 13:52:58 +08:00
b022d3a68c 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m15s
2025-08-22 20:52:39 +08:00
63e5abc003 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-22 20:41:13 +08:00
8340f5cf6a 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m24s
2025-08-22 20:03:34 +08:00
lxj
9897bb8db7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-22 18:14:28 +08:00
lxj
4a62ad17c3 修改详情逻辑 2025-08-22 18:14:17 +08:00
1e39769309 更新 ruoyi-modules/Sis/Dockerfile
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-22 17:55:44 +08:00
lxj
df9e3b77ff 删除hik sdk 和宇试文档
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 5m40s
2025-08-22 17:46:07 +08:00
lxj
42b5c78658 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-22 17:44:44 +08:00
lxj
49401d42ba 增加事件处理详情 2025-08-22 17:44:33 +08:00
1aa576a9ae 修改了权限bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-22 17:33:25 +08:00
dy
d0ccd668fa 修改前端不返回设备bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m30s
2025-08-22 16:29:37 +08:00
dy
3c144d00e5 前端不传集合时状态改不了的bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m19s
2025-08-22 14:48:31 +08:00
2e314b2901 feat(sis): 添加图片压缩工具类并优化访客照片上传逻辑
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 7m17s
2025-08-21 23:14:12 +08:00
2103be1de5 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m19s
2025-08-21 18:10:30 +08:00
2a143bb147 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-21 17:35:28 +08:00
37966e73c1 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m26s
2025-08-21 15:10:54 +08:00
f01d28b21e 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m21s
2025-08-21 14:27:30 +08:00
db9b1e1cd3 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m27s
2025-08-21 14:11:51 +08:00
dy
0385bef3f4 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m31s
2025-08-21 11:30:49 +08:00
dy
eba9e78695 反查 2025-08-21 11:30:38 +08:00
15683799673
be3992c1dc 增加人脸抓拍,人脸上报消费者
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-21 02:53:04 +08:00
dy
5c9672dc18 分包
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-20 23:51:53 +08:00
dy
5fb396575d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m21s
2025-08-20 22:08:51 +08:00
dy
f23b02fe51 处理排班跨月且覆盖当月最后一天的情况,如排班从当月开始,下个月结束 2025-08-20 22:08:01 +08:00
lxj
62d9a21627 海康设备对接单独拆分 2025-08-20 17:57:09 +08:00
15683799673
d5d8b80f49 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m41s
2025-08-20 13:06:13 +08:00
15683799673
9e346ba882 屏蔽海康sdk 2025-08-20 13:06:06 +08:00
6e83b36987 sis部署
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m35s
2025-08-20 12:50:52 +08:00
2ec65fe29f Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m43s
2025-08-20 11:58:52 +08:00
d392021952 feat(property): 添加智能灯控功能 2025-08-20 11:58:37 +08:00
3a44280abe 新增热门活动自动更新状态
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m50s
2025-08-20 10:46:52 +08:00
a056feae53 Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m44s
2025-08-19 18:06:28 +08:00
eecf869640 feat(Property): 新增灯控开关信息相关功能 2025-08-19 18:05:58 +08:00
dy
f7d1f81940 1
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-19 18:03:46 +08:00
dy
4f62b3bea3 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-19 17:38:34 +08:00
dy
9034f0ef7a 1 2025-08-19 17:38:24 +08:00
c1c3950b2d 新增热门活动
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m32s
2025-08-19 16:31:09 +08:00
0ee671fbcf 新增热门活动
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m35s
2025-08-19 14:36:13 +08:00
dy
7376a7a9be Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m35s
2025-08-19 09:57:31 +08:00
dy
6397085fe9 排班的区域管理 2025-08-19 09:54:33 +08:00
6d3849fa64 修正访客上传图片
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m18s
2025-08-18 20:43:12 +08:00
dy
23cab413c2 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-18 20:21:24 +08:00