312 Commits

Author	SHA1	Message	Date
zcxlsm	8ae12277d8	Merge remote-tracking branch 'origin/master'	2025-07-23 17:32:11 +08:00
zcxlsm	1124b832ac	feat(sis): 添加权限组⇄设备关联功能	2025-07-23 17:30:27 +08:00
dy	919d0937cd	考勤组bug修改	2025-07-23 17:13:41 +08:00
dy	1388e918c3	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-23 16:20:57 +08:00
dy	5da0665092	考勤组bug修改	2025-07-23 16:20:25 +08:00
yuyongle	e026c73627	修改了会议记录bug	2025-07-23 15:20:06 +08:00
yuyongle	99c15c311f	修改了会议记录bug	2025-07-23 15:01:21 +08:00
zcxlsm	2c8d32f945	feat(property): 添加权限组字段	2025-07-23 13:15:13 +08:00
zcxlsm	d540a37543	feat(sis): 更新授权组相关实体	2025-07-23 13:09:30 +08:00
zcxlsm	5d2aa88690	feat(sis): 添加授权组管理功能	2025-07-23 10:54:33 +08:00
yuyongle	350b8f511c	新增客户服务功能	2025-07-23 09:28:20 +08:00
yuyongle	359e73fa97	新增客户服务功能	2025-07-22 20:53:33 +08:00
lxj	9ac415d6fc	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-22 19:25:18 +08:00
lxj	67bf690c8a	流媒体服务接口逻辑更改	2025-07-22 19:25:09 +08:00
dy	ab9fc43996	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-22 15:49:47 +08:00
dy	c289a25829	日历的具体考勤和班次信息	2025-07-22 15:49:18 +08:00
zcxlsm	1c64023502	Merge remote-tracking branch 'origin/master'	2025-07-22 11:40:20 +08:00
zcxlsm	b95f99532f	feat(sis): 电梯授权增加楼层选择功能	2025-07-22 11:40:00 +08:00
mocheng	77b345e017	sso	2025-07-22 10:13:14 +08:00
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	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	a198e0c720	fix(property):	2025-07-20 19:23:22 +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
zcxlsm	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	2025-07-16 19:15:46 +08:00
dy	63dd804ced	固定班制的新增业务	2025-07-16 19:15:27 +08:00
yuyongle	dbf9346953	新增设备管理功能	2025-07-16 17:40:37 +08:00
zcxlsm	8dbb2aab9d	refactor(sis): 楼层下发权限修改	2025-07-16 11:18:07 +08:00
zcxlsm	c2c0d1ffb4	refactor(sis): 楼层下发权限修改	2025-07-16 11:16:55 +08:00
zcxlsm	3511a0b8c1	Merge remote-tracking branch 'origin/master'	2025-07-16 10:13:29 +08:00
zcxlsm	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	2025-07-16 09:45:45 +08:00
dy	978c1f6f9e	新增状态常量使用	2025-07-16 09:45:29 +08:00
zcxlsm	2c794447d8	refactor(sis): ... - 移除建筑物楼层信息相关代码，从物业模块引入	2025-07-16 09:42:28 +08:00
15683799673	bbb80f3a63	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	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
zcxlsm	fdc70aec0a	feat(sis): ... - 新增楼层信息相关操作 - 新增电梯⇄楼层关联信息相关操作 - 梯控流程补全	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
zcxlsm	a04a6b5571	Merge remote-tracking branch 'origin/master'	2025-07-15 13:44:12 +08:00
zcxlsm	172ede3eb3	feat(auth): 人员库授权功能调整	2025-07-15 13:43:55 +08:00
yuyongle	54655ae6d6	修改巡检任务bug	2025-07-15 11:52:38 +08:00
zcxlsm	8b340c9e95	refactor(sis): 授权记录模块重新调整	2025-07-14 23:15:29 +08:00
zcxlsm	f53dee48ca	refactor(sis):	2025-07-14 22:02:34 +08:00
zcxlsm	9305db7f7a	Merge remote-tracking branch 'origin/master'	2025-07-14 18:27:07 +08:00
zcxlsm	c1bcdd367a	feat(sis): ... - 添加人像写入关联表 - 人像信息表libId删除	2025-07-14 18:26:35 +08:00
yuyongle	71814b3b5b	修改工单类型bug	2025-07-14 17:34:15 +08:00
zcxlsm	83cc3a4f84	feat(sis): 人像关系id	2025-07-14 14:32:08 +08:00
zcxlsm	2d14253d5c	feat(sis): 1	2025-07-14 11:24:59 +08:00
zcxlsm	eb8665c872	Merge remote-tracking branch 'origin/master'	2025-07-14 11:23:05 +08:00
zcxlsm	7440f1bc9a	feat(sis): 新增人像库-人像图片关联	2025-07-14 11:22:19 +08:00
dev_ljl	0cf20a8408	1、入驻单位状态修改	2025-07-14 10:14:18 +08:00
lxj	250d308a7f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-13 17:45:26 +08:00
lxj	30f70fd08d	梯控对接	2025-07-13 17:43:02 +08:00
zcxlsm	25ffc7adc7	Merge remote-tracking branch 'origin/master'	2025-07-12 15:45:55 +08:00