Commit Graph

251 Commits

Author SHA1 Message Date
e1f716c70b refactor(property):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 水电气表业务、厂商业务移动至物业模块
2025-07-17 13:12:11 +08:00
3f97caad42 refactor(property):
- 水电气表业务、厂商业务移动至物业模块
2025-07-17 12:38:58 +08:00
177bbe5a8f refactor(sis): - 电梯⇄楼层关联表字段变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 11:56:35 +08:00
lxj
f866e2ffc6 hik-sdk jna 版本升级
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 02:11:58 +08:00
7928aa16f8 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 22:01:53 +08:00
43933c83c5 feat(property): floor 2025-07-16 22:01:36 +08:00
dy
f16a9e0897 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-16 19:15:46 +08:00
dy
63dd804ced 固定班制的新增业务 2025-07-16 19:15:27 +08:00
dbf9346953 新增设备管理功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 17:40:37 +08:00
8dbb2aab9d refactor(sis): 楼层下发权限修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 11:18:07 +08:00
c2c0d1ffb4 refactor(sis): 楼层下发权限修改 2025-07-16 11:16:55 +08:00
3511a0b8c1 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 10:13:29 +08:00
ed97e7cefb feat(property):
- 新增查询所有楼层和根据单元ID查询楼层的功能
- 在新增楼层时增加同一单元楼层重复校验
2025-07-16 10:12:24 +08:00
dy
365ec14925 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-16 09:45:45 +08:00
dy
978c1f6f9e 新增状态常量使用 2025-07-16 09:45:29 +08:00
2c794447d8 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 移除建筑物楼层信息相关代码,从物业模块引入
2025-07-16 09:42:28 +08:00
15683799673
bbb80f3a63 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-16 02:36:48 +08:00
15683799673
9c5cd99a54 增加视频模块相关代码 2025-07-16 02:36:26 +08:00
15683799673
fa28f2d351 增加视频模块相关代码 2025-07-16 02:35:44 +08:00
dy
47c35c603c 修改班次管理业务逻辑 2025-07-15 22:42:05 +08:00
fdc70aec0a feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 新增楼层信息相关操作
- 新增电梯⇄楼层关联信息相关操作
- 梯控流程补全
2025-07-15 18:45:48 +08:00
dy
94b0156479 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-15 15:17:08 +08:00
dy
bd484cf106 考勤基本代码 2025-07-15 15:16:47 +08:00
a04a6b5571 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 13:44:12 +08:00
172ede3eb3 feat(auth): 人员库授权功能调整 2025-07-15 13:43:55 +08:00
54655ae6d6 修改巡检任务bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 11:52:38 +08:00
8b340c9e95 refactor(sis): 授权记录模块重新调整
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 23:15:29 +08:00
f53dee48ca refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 22:02:34 +08:00
9305db7f7a Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 18:27:07 +08:00
c1bcdd367a feat(sis):
- 添加人像写入关联表
 - 人像信息表libId删除
2025-07-14 18:26:35 +08:00
71814b3b5b 修改工单类型bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 17:34:15 +08:00
83cc3a4f84 feat(sis): 人像关系id
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 14:32:08 +08:00
2d14253d5c feat(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 11:24:59 +08:00
eb8665c872 Merge remote-tracking branch 'origin/master' 2025-07-14 11:23:05 +08:00
7440f1bc9a feat(sis): 新增人像库-人像图片关联 2025-07-14 11:22:19 +08:00
0cf20a8408 1、入驻单位状态修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 10:14:18 +08:00
lxj
250d308a7f 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-13 17:45:26 +08:00
lxj
30f70fd08d 梯控对接 2025-07-13 17:43:02 +08:00
25ffc7adc7 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 15:45:55 +08:00
43171c2cac refactor(sis): 华为盒子心跳保活 2025-07-12 15:45:36 +08:00
lxj
3e81ca335f 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-12 14:00:47 +08:00
lxj
5ad50d96b9 hik sdk 对接人脸抓拍 2025-07-12 13:52:44 +08:00
6246f897cb refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 11:15:51 +08:00
767551cb34 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 10:43:31 +08:00
f11f199f51 refactor(sis): - 华为人脸对比改动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 09:58:22 +08:00
34dc9d652b refactor(sis): - 华为人脸对比改动 2025-07-12 09:57:55 +08:00
421bc821eb refactor(sis): - E8同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 19:27:20 +08:00
13eee82adc Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 17:57:34 +08:00
493c0e641f refactor(sis): - E8同步 2025-07-11 17:57:17 +08:00
7c9f400cfd 新增巡检功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 17:30:18 +08:00
dy
1beae8d9af 修改不能按条件查询的bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 23s
2025-07-11 11:15:28 +08:00
dy
8c6e6507df Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-11 10:07:04 +08:00
dy
0fe62c735c 修改备注不能为空的问题 2025-07-11 10:01:41 +08:00
15683799673
be7002153c 授权逻辑更改
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 21s
2025-07-11 07:37:41 +08:00
6a7095ec58 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:59:53 +08:00
7db6d2adac refactor(sis):
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:58:42 +08:00
d70d99fb9a refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人员库业务逻辑调整
- 人像信息业务逻辑调整
- 华为盒子服务
2025-07-10 21:05:13 +08:00
lxj
2347d46a9b Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 18:36:58 +08:00
lxj
815fe53f1a 增加梯控服务 2025-07-10 18:36:45 +08:00
dy
6127223a78 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-10 14:50:22 +08:00
dy
f9ea62db04 1 2025-07-10 14:43:57 +08:00
4e60d1f3d1 修改工单类型bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 14:30:34 +08:00
15683799673
f98e94ecd1 增加电梯表 2025-07-10 08:45:01 +08:00
2eab7e5242 新增工单类型表
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 13m26s
2025-07-09 18:17:51 +08:00
ca962395f6 Merge remote-tracking branch 'origin/master' 2025-07-09 18:17:10 +08:00
lxj
302c4be55c Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 18:11:07 +08:00
lxj
c7ff295d76 增加hik梯控操作 2025-07-09 18:10:52 +08:00
7ccce852e9 新增工单类型表 2025-07-09 16:26:10 +08:00
52cffa205c 新增mapper注解
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 13:46:30 +08:00
dy
8233524b2b 默认设置新增订单时为未退订
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 13:17:40 +08:00
dy
74c7a809d9 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-09 13:08:13 +08:00
dy
a8b1254b96 实体类新增is_unbooking字段 2025-07-09 13:07:59 +08:00
eb1ec10c86 修改了会议预约记录列表bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 12:38:05 +08:00
21c149bf0c 修改了会议预约记录bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 12m42s
2025-07-09 09:16:54 +08:00
dy
e3e4e38f91 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m44s
2025-07-08 23:41:23 +08:00
dy
a5dae3530d 解决新增问题和根据id查询问题 2025-07-08 23:41:03 +08:00
f69326343e 修改了会议预约bug
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 8m37s
2025-07-08 16:13:56 +08:00
c49bb4cdb3 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-08 16:08:38 +08:00
bb98a34fa6 1、 2025-07-08 16:08:19 +08:00
ba9202e6ca 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 13m8s
2025-07-07 17:30:03 +08:00
7dc0a87a23 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:20:28 +08:00
dy
1ca5352a9d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 13m54s
2025-07-07 15:27:33 +08:00
dy
a349719de9 解决总价不能上传的问题 2025-07-07 15:27:21 +08:00
7b40b084c1 1、绿植统计下单客户总数
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m42s
2025-07-07 14:16:01 +08:00
9a34602030 1、租赁订单
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 22m59s
2025-07-05 17:38:27 +08:00
73b4581836 新增支付状态枚举接口
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-05 15:54:34 +08:00
322a9944e8 新增支付状态枚举接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-05 15:45:50 +08:00
487480c0e1 更新 ruoyi-modules/Property/Dockerfile
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 38s
2025-07-05 14:25:46 +08:00
5b45214bbe Merge remote-tracking branch 'origin/master' 2025-07-05 11:49:09 +08:00
20f6cc8541 refactor(sis): base64指定格式JPG 2025-07-05 11:48:57 +08:00
d09c0c7df8 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m11s
2025-07-05 11:07:04 +08:00
9217befba8 refactor(sis): 1
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m43s
2025-07-05 10:07:46 +08:00
2c6733d1ea 上传文件至 ruoyi-modules/Property
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m27s
2025-07-04 18:03:29 +08:00
014a157921 1、绿植租赁统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-04 17:59:19 +08:00
79d55e458f 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m43s
2025-07-04 14:57:15 +08:00
dy
398e19f2f7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-03 12:05:10 +08:00
dy
4a20ec11db 保洁订单详情 2025-07-03 12:04:51 +08:00
dy
147c67b5ad 保洁订单详情 2025-07-03 09:36:04 +08:00
9a8ccb1f57 1、租赁订单统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-02 17:58:52 +08:00
lxj
84de853d7c 人脸远程报警完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:54:54 +08:00