Commit Graph

239 Commits

Author SHA1 Message Date
b75b799432 新增调查问卷功能
Some checks failed
/ build-and-push-services (ruoyi-auth) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-gateway) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/Property) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/Sis) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-seata-server) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-snailjob-server) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Blocked by required conditions
/ build-parent-pom (push) Has been cancelled
2025-08-14 17:23:36 +08:00
dy
67b3ae8d17 1 2025-08-14 17:18:33 +08:00
dy
9abb69888b 排班区域 2025-08-14 15:41:00 +08:00
dy
74e5323934 部门名称 2025-08-14 15:16:53 +08:00
dy
e41835c95e 远程调用 2025-08-14 12:31:17 +08:00
dy
cef84284bb 排班区域管理 2025-08-14 09:16:19 +08:00
dy
005dbc1110 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-13 16:24:14 +08:00
dy
b43c3b25e0 bug 2025-08-13 16:21:30 +08:00
89041e783b websocket
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-13 15:08:38 +08:00
9dbccf93a8 websocket
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-13 15:07:54 +08:00
e73d6abf62 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-13 10:21:58 +08:00
dy
627f2a1a11 bug1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 16:42:50 +08:00
dy
1b64c97626 1 2025-08-12 16:17:54 +08:00
dy
a7db0253e8 根据id读取用户信息
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 11:16:23 +08:00
dy
4861c89c57 根据id读取用户信息 2025-08-11 16:44:26 +08:00
dy
d1473886f6 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-11 10:11:06 +08:00
dy
32b3768789 1 2025-08-11 10:10:36 +08:00
69e652b224 Merge remote-tracking branch 'origin/master' 2025-08-11 09:39:28 +08:00
af22185111 修改了工单bug 2025-08-11 09:38:57 +08:00
d5e46d88df H5访客
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-08 18:43:48 +08:00
48984a494d 修改了保工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-08 11:42:59 +08:00
989421e244 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 22:34:57 +08:00
e3867b7a12 feat(sis): 支持黑名单人员管理
- 新增人员标签类型字段,用于区分红名单、白名单和黑名单
- 修改授权逻辑,黑名单人员不进行授权记录和E8平台同步
- 优化定时任务,对不同名单类型的人员进行差异化处理
- 增加黑名单人员入内的告警功能
2025-08-07 22:34:06 +08:00
6444a9330b 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:34:18 +08:00
dy
4893a04d39 部分数据不能查询bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:22:39 +08:00
dy
1a2a9a1035 排班删除和同步告警数据 2025-08-07 14:56:57 +08:00
dy
6023f35674 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-07 11:25:18 +08:00
dy
2deb9b96f9 1 2025-08-07 11:24:50 +08:00
20faf13328 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 09:39:08 +08:00
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
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
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
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
cb84447450 修改了资产bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 12:15:13 +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
dy
6d9266ee21 排班不能获取id的bug 2025-08-05 11:07:16 +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
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
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
0c34fedc8d 访客&&大屏 2025-08-04 19:59:48 +08:00