Commit Graph

348 Commits

Author SHA1 Message Date
389ba82659 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 20:47:51 +08:00
6c57942886 feat(sis): 解压指定编码GBK 2025-07-31 20:47:18 +08:00
lxj
dc3b6ab197 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-31 15:43:02 +08:00
lxj
e016e6d44c 同步通道任务完善 2025-07-31 15:38:04 +08:00
9afeed3108 feat(sis): 重构智能设备通信模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 15:12:24 +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
14b6077ea7 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 18:43:12 +08:00
dy
e69093390c 排班详情 2025-07-30 18:42:41 +08:00
lxj
8f71f5f261 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 18:41:47 +08:00
lxj
95dfc5ef9b 增加设备定时更新状态任务 2025-07-30 18:41:31 +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
6938640419 feat(Sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 09:09:27 +08:00
lxj
7ef6d2ab47 设备通道逻辑修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 05:58:21 +08:00
lxj
ef7ca1fa5a 设备通道逻辑修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 05:46:35 +08:00
lxj
1b3fd18873 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-30 05:43:08 +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
9602ef96f7 修改园区管理bug 2025-07-29 17:27:56 +08:00
dy
d42e2c627f 班次id无法查询bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 17:15:45 +08:00
dy
28143d17e7 详情bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 16:59:17 +08:00
dy
b303ab6faa 新增固定班制主键重复修复
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 15:47:40 +08:00
dy
da0ba9aa0a 抽取公共方法
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 11:08:59 +08:00
dy
bff00b7b4a 新增排班问题处理 2025-07-29 11:06:29 +08:00
dy
64c3355e05 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-29 09:38:01 +08:00
dy
00b85990f4 修改 2025-07-29 09:37:11 +08:00
4a73dd53ee Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 02:05:15 +08:00
e3e26f46c1 feat(property):
- 新增入驻员工导入功能,支持导入员工信息和人脸数据
2025-07-29 02:04:15 +08:00
lxj
0efbb1051e Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-28 20:27:35 +08:00
lxj
ad567ec13a 设备通道逻辑修改 2025-07-28 20:27:21 +08:00
887b23e5ca SOS同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 17:04:22 +08:00
95b3be486a 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 17:00:27 +08:00
fe7620fac4 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 15:30:13 +08:00
5274fb8d64 SOS同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 01:01:25 +08:00
cd9227be31 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 23:11:06 +08:00
dy
bee90b70d1 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-27 22:54:10 +08:00
dy
f92ef72238 1 2025-07-27 22:53:46 +08:00
15b25144f0 SOS 2025-07-27 22:40:39 +08:00
23e3100146 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 22:00:54 +08:00
b857a2121b refactor(sis): 1 2025-07-27 22:00:41 +08:00
dy
b3813dfe75 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-27 21:01:18 +08:00
dy
ae44ccb565 周期表不能插入bug及修改 2025-07-27 21:01:02 +08:00
56dcc609d1 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 19:53:57 +08:00
4458432b5d Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 19:47:17 +08:00
041db8c435 feat(sis): 添加模拟上下文登录功能 2025-07-27 19:47:05 +08:00
1a900ad3db feat(sis): 添加模拟上下文登录功能 2025-07-27 19:46:18 +08:00