220 Commits

Author	SHA1	Message	Date
yuyongle	9602ef96f7	修改园区管理bug	2025-07-29 17:27:56 +08:00
dy	d42e2c627f	班次id无法查询bug	2025-07-29 17:15:45 +08:00
dy	28143d17e7	详情bug	2025-07-29 16:59:17 +08:00
dy	b303ab6faa	新增固定班制主键重复修复	2025-07-29 15:47:40 +08:00
dy	da0ba9aa0a	抽取公共方法	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	2025-07-29 09:38:01 +08:00
dy	00b85990f4	修改	2025-07-29 09:37:11 +08:00
zcxlsm	4a73dd53ee	Merge remote-tracking branch 'origin/master'	2025-07-29 02:05:15 +08:00
zcxlsm	e3e26f46c1	feat(property): ... - 新增入驻员工导入功能，支持导入员工信息和人脸数据	2025-07-29 02:04:15 +08:00
yuyongle	95b3be486a	修改园区管理bug	2025-07-28 17:00:27 +08:00
yuyongle	fe7620fac4	修改园区管理bug	2025-07-28 15:30:13 +08:00
dy	f92ef72238	1	2025-07-27 22:53:46 +08:00
dy	b3813dfe75	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-27 21:01:18 +08:00
dy	ae44ccb565	周期表不能插入bug及修改	2025-07-27 21:01:02 +08:00
yuyongle	7bdd9ff072	新增采购功能	2025-07-27 17:10:30 +08:00
dy	eb7d29640b	详情返回无打卡日期bug	2025-07-27 17:07:58 +08:00
dy	dd733fe5e2	数据无返回bug	2025-07-27 16:01:55 +08:00
dy	ff7bf241cb	1	2025-07-27 15:28:22 +08:00
dy	a043e18ba6	默认值	2025-07-27 15:22:50 +08:00
dy	751e65774f	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-27 15:03:21 +08:00
dy	2150602335	1	2025-07-27 15:01:43 +08:00
dy	cd2703080d	考勤组插入bug	2025-07-27 14:42:07 +08:00
dy	ca4d366d74	考勤组插入bug	2025-07-27 14:41:53 +08:00
zcxlsm	47f389c560	Merge remote-tracking branch 'origin/master'	2025-07-26 17:54:17 +08:00
zcxlsm	127336af6d	refactor(sis): 定时任务逻辑	2025-07-26 17:53:57 +08:00
yuyongle	ba0c495c42	新增车辆管理功能	2025-07-26 17:53:48 +08:00
zcxlsm	d070a52487	Merge remote-tracking branch 'origin/master'	2025-07-26 02:37:23 +08:00
zcxlsm	3b7635bf1d	feat(auth): 人员授权相关功能修改	2025-07-26 02:37:02 +08:00
yuyongle	819105a470	修改了社区bug	2025-07-25 18:17:34 +08:00
dy	c0d43c01c6	Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks	2025-07-25 10:28:21 +08:00
dy	6cc04a9cac	修改id传值	2025-07-25 10:26:31 +08:00
zcxlsm	2a2df4e501	feat(Property): dubbo接口调用异常	2025-07-24 21:15:50 +08:00
zcxlsm	f2aafe220f	feat(sis): 新增个人门禁授权功能	2025-07-24 19:04:44 +08:00
yuyongle	c49bc001bb	修改了社区bug	2025-07-24 10:58:17 +08:00
yuyongle	81ebb3e8c1	修改了社区bug	2025-07-24 10:20:38 +08:00
yuyongle	31291b4413	增加工单看板功能	2025-07-23 20:52:32 +08:00
dy	2631febd2a	新增时间的问题	2025-07-23 19:27:43 +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
yuyongle	350b8f511c	新增客户服务功能	2025-07-23 09:28:20 +08:00
yuyongle	359e73fa97	新增客户服务功能	2025-07-22 20:53:33 +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
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
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
yuyongle	aa5b0b9478	修改了费用bug	2025-07-18 20:57:02 +08:00
yuyongle	6163532f39	修改了费用bug	2025-07-18 17:48:04 +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	9f2c4658a0	新增费用功能	2025-07-18 09:21:44 +08:00
zcxlsm	894cb912f0	refactor(sis): 1	2025-07-17 16:22:16 +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
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	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	978c1f6f9e	新增状态常量使用	2025-07-16 09:45:29 +08:00
dy	47c35c603c	修改班次管理业务逻辑	2025-07-15 22:42:05 +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
yuyongle	54655ae6d6	修改巡检任务bug	2025-07-15 11:52:38 +08:00
yuyongle	71814b3b5b	修改工单类型bug	2025-07-14 17:34:15 +08:00
dev_ljl	0cf20a8408	1、入驻单位状态修改	2025-07-14 10:14:18 +08:00
yuyongle	7c9f400cfd	新增巡检功能	2025-07-11 17:30:18 +08:00
dy	1beae8d9af	修改不能按条件查询的bug	2025-07-11 11:15:28 +08:00
dy	0fe62c735c	修改备注不能为空的问题	2025-07-11 10:01:41 +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
yuyongle	4e60d1f3d1	修改工单类型bug	2025-07-10 14:30:34 +08:00