Commit Graph

480 Commits

Author SHA1 Message Date
dy
29ba1ab5c6 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 16:48:15 +08:00
dy
66721b34cd 1 2025-08-06 16:47:46 +08:00
f0a7f2147f 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 16:40:20 +08:00
2b19146c70 feat:工单类型不分页查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 14:00:01 +08:00
c78d90a316 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 12:46:14 +08:00
lxj
fedc381713 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemotePrecautionaryImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
2025-08-06 12:39:06 +08:00
lxj
70fe6d713a 增加设备和门禁的关联关系 2025-08-06 12:35:22 +08:00
17d041e51d feat(sis): 1 2025-08-06 12:03:06 +08:00
dy
5a92f9032e Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 11:37:54 +08:00
dy
0a18e0c1a6 排班按月份查询重构 2025-08-06 11:37:29 +08:00
3fa1beca78 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:08:15 +08:00
4acfdb6b35 访客接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:02:11 +08:00
00ad9a1330 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 09:50:50 +08:00
a4e40f5123 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:16:23 +08:00
db58a91252 feat(sis):
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:14:07 +08:00
f619c65261 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 16:35:46 +08:00
a12ee50d08 feat(device): 增加设备绑定楼层信息 2025-08-05 16:35:00 +08:00
dy
b91201cf7f Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 16:27:13 +08:00
dy
86c28e95dd 访客pc端新增 2025-08-05 16:26:53 +08:00
1288d27125 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 14:37:11 +08:00
b7a4e512f0 feat(auth): 优化授权组相关功能 2025-08-05 14:36:57 +08:00
cb84447450 修改了资产bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 12:15:13 +08:00
bbe911119c Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 11:54:55 +08:00
82740b7d62 refactor(sis): 冗余数据方便查询 2025-08-05 11:54:48 +08:00
dy
eb03629e84 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 11:22:04 +08:00
c488f666d2 refactor(sis): 1 2025-08-05 11:15:25 +08:00
dy
6d9266ee21 排班不能获取id的bug 2025-08-05 11:07:16 +08:00
2a36ddf688 refactor(huawei): 封装返回结果
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 10:57:39 +08:00
5d81537bdb Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 10:51:41 +08:00
bbd895f116 refactor(sis): 1 2025-08-05 10:51:31 +08:00
8093e1cfd7 访客&&大屏
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 09:58:20 +08:00
290780379d Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 09:38:50 +08:00
15683799673
59f8e0fc2f 人脸告警数据写入完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 00:44:43 +08:00
15683799673
6b1519a5b6 人脸告警数据写入完成 2025-08-05 00:44:13 +08:00
dy
4316a25f6e Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 23:41:53 +08:00
dy
7b37ed293f 排班详情修改 2025-08-04 23:39:43 +08:00
7c52b9b851 feat(elevator): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 23:30:51 +08:00
0db07e6d53 refactor(property): 将 RemoteUnitService 调整为 RemoteBuildingService
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 22:04:41 +08:00
0cb299d383 feat(resource): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 21:36:42 +08:00
lxj
26b609ea81 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 20:01:00 +08:00
lxj
58971070e9 同步代码 2025-08-04 20:00:51 +08:00
0c34fedc8d 访客&&大屏 2025-08-04 19:59:48 +08:00
15f97ac503 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:58:49 +08:00
f1625b6e5f feat(sis): 电梯⇄楼层⇄通道关联功能 2025-08-04 19:58:23 +08:00
lxj
291f9e7ffa Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:52:57 +08:00
80a42d32ea feat(core): ContentTypeEnum
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:51:05 +08:00
lxj
1f4e168b56 同步代码 2025-08-04 19:50:46 +08:00
00be7b4c47 refactor(property): 修改楼层查询接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:13:26 +08:00
1fcfa11608 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
2025-08-04 19:10:54 +08:00
cf5757c48f refactor(property): 修改楼层查询接口 2025-08-04 19:08:41 +08:00