Commit Graph

220 Commits

Author SHA1 Message Date
d5e46d88df H5访客
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
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
cf5757c48f refactor(property): 修改楼层查询接口 2025-08-04 19:08:41 +08:00
063b424b2b 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 14:28:30 +08:00
dy
f7db092af8 排班按月查询bug修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 13:04:32 +08:00
dy
c104a71f76 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 10:11:16 +08:00
dy
f9fe218f7a 排班bug修改 2025-08-04 10:10:55 +08:00
c66c81b434 修改了工单管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 09:09:34 +08:00
f7cdf4bc09 refactor(sis): 定时授权任务通过snail-job触发
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-02 15:50:40 +08:00
c366a30488 refactor(property): 优化授权逻辑
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-01 14:45:28 +08:00
6c57942886 feat(sis): 解压指定编码GBK 2025-07-31 20:47:18 +08:00
7af0cee8e9 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 19:58:55 +08:00
79f98b5387 refactor(property): 优化人员导入和人脸上传功能 2025-07-30 19:58:22 +08:00
dy
e69093390c 排班详情 2025-07-30 18:42:41 +08:00
dy
40a9cb65b8 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-07-30 16:18:15 +08:00
dy
6965b78db0 排班详情 2025-07-30 16:17:52 +08:00
17f342ed76 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 16:06:47 +08:00
f0beb7be5e Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 09:18:39 +08:00
ec23e32ed6 feat(Sis): 删除入驻员工包括删除授权记录和人像库图片,并调用 E8 平台 API 删除客户信息
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 23:22:35 +08:00
b7fa3cd788 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 18:37:26 +08:00
21985e48e7 fix(sis): 优化人脸照片同步和授权记录更新逻辑 2025-07-29 18:37:03 +08:00