308 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lxj	c9c6f229bd	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-21 21:02:13 +08:00
lxj	2d1b6d8ff7	视频监控逻辑完善	2025-07-21 21:01:17 +08:00
15683799673	9fc7fb0fde	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-21 21:00:50 +08:00
15683799673	ed091501d7	增加按需取流接口	2025-07-21 21:00:40 +08:00
yuyongle	1e9efc77ed	修改了工单bug	2025-07-21 20:56:46 +08:00
yuyongle	0b90663d3d	修改了工单bug	2025-07-21 14:37:15 +08:00
dy	4010cc7dfa	1	2025-07-21 10:10:30 +08:00
dy	f3973d2595	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # pom.xml	2025-07-21 10:07:51 +08:00
dy	34d7b40645	时间格式化问题	2025-07-21 10:04:56 +08:00
15683799673	800a2de30f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks ... # Conflicts: # pom.xml # ruoyi-modules/Property/pom.xml	2025-07-21 03:37:26 +08:00
15683799673	365ca2d7bc	物业模块删除厂商 ... 安防模块增加厂商 设备模块逻辑优化	2025-07-21 03:36:07 +08:00
zcxlsm	7511227e51	Merge remote-tracking branch 'origin/master'	2025-07-20 19:23:41 +08:00
zcxlsm	a198e0c720	fix(property):	2025-07-20 19:23:22 +08:00
mocheng	0e5e73be26	sso	2025-07-20 18:50:36 +08:00
zcxlsm	f45442e954	Merge remote-tracking branch 'origin/master'	2025-07-20 15:02:02 +08:00
zcxlsm	63b96a79d6	fix(property):	2025-07-20 15:01:54 +08:00
yuyongle	e6c3c7d88a	修改了费用bug	2025-07-20 14:52:38 +08:00
zcxlsm	426717e9cc	feat(sis): 新增智能照明控制功能	2025-07-20 14:24:30 +08:00
zcxlsm	498209cb87	feat(sdk): 添加电表和水表通信工具类	2025-07-20 14:01:54 +08:00
dy	f24df2e494	依赖冲突	2025-07-20 10:32:06 +08:00
dy	0c0ecf8f93	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-19 17:15:01 +08:00
dy	8c4748c9a3	修复排班bug	2025-07-19 17:12:58 +08:00
dy	e4c21c831b	修复排班bug	2025-07-19 17:10:57 +08:00
zcxlsm	073e235179	refactor(property): 1	2025-07-19 16:55:27 +08:00
zcxlsm	98fb035a97	refactor(property): meter_type字典转换	2025-07-19 16:21:55 +08:00
zcxlsm	eb5efd9a6c	refactor(property): 1	2025-07-19 13:52:02 +08:00
zcxlsm	5a88e94c23	refactor(property): 水电气表字段更改	2025-07-19 13:42:03 +08:00
zcxlsm	b4228c0425	feat(property): 添加仪表抄记功能	2025-07-19 12:38:54 +08:00
dy	49ec73df49	1	2025-07-19 09:52:37 +08:00
15683799673	adafd52d0f	修改安防设备管理模块逻辑	2025-07-19 09:10:20 +08:00
yuyongle	aa5b0b9478	修改了费用bug	2025-07-18 20:57:02 +08:00
yuyongle	6163532f39	修改了费用bug	2025-07-18 17:48:04 +08:00
lxj	b7d225c107	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-18 15:13:31 +08:00
lxj	305705abc0	增加海康摄像头上报事件	2025-07-18 15:13:18 +08:00
dy	625be80cf2	1	2025-07-18 11:07:22 +08:00
dy	5d042a2151	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-18 10:10:48 +08:00
dy	75292374fa	排班	2025-07-18 10:04:38 +08:00
dy	72b3e40124	排班	2025-07-18 10:03:44 +08:00
dy	d8dfde621e	排班	2025-07-18 10:03:20 +08:00
yuyongle	9c0591dfaa	Merge remote-tracking branch 'origin/master'	2025-07-18 09:22:10 +08:00
yuyongle	9f2c4658a0	新增费用功能	2025-07-18 09:21:44 +08:00
zcxlsm	e07f690002	refactor(sis): 整合E8相关接口	2025-07-17 19:54:57 +08:00
zcxlsm	ec2d00ac72	refactor(sis): 1	2025-07-17 16:39:37 +08:00
zcxlsm	894cb912f0	refactor(sis): 1	2025-07-17 16:22:16 +08:00
zcxlsm	f35a15fc23	refactor(sis): 字段更改	2025-07-17 14:49:38 +08:00
zcxlsm	e1f716c70b	refactor(property): ... - 水电气表业务、厂商业务移动至物业模块	2025-07-17 13:12:11 +08:00
zcxlsm	3f97caad42	refactor(property): ... - 水电气表业务、厂商业务移动至物业模块	2025-07-17 12:38:58 +08:00
zcxlsm	177bbe5a8f	refactor(sis): - 电梯⇄楼层关联表字段变动	2025-07-17 11:56:35 +08:00
lxj	f866e2ffc6	hik-sdk jna 版本升级	2025-07-17 02:11:58 +08:00
zcxlsm	7928aa16f8	Merge remote-tracking branch 'origin/master'	2025-07-16 22:01:53 +08:00