Commit Graph

125 Commits

Author SHA1 Message Date
359e73fa97 新增客户服务功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 20:53:33 +08:00
dy
ab9fc43996 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-22 15:49:47 +08:00
dy
c289a25829 日历的具体考勤和班次信息 2025-07-22 15:49:18 +08:00
1e9efc77ed 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-21 20:56:46 +08:00
0b90663d3d 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
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
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# 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
a198e0c720 fix(property): 2025-07-20 19:23:22 +08:00
f45442e954 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 15:02:02 +08:00
63b96a79d6 fix(property): 2025-07-20 15:01:54 +08:00
e6c3c7d88a 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:52:38 +08:00
dy
f24df2e494 依赖冲突
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 10:32:06 +08:00
dy
0c0ecf8f93 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-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
073e235179 refactor(property): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 16:55:27 +08:00
98fb035a97 refactor(property): meter_type字典转换
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 16:21:55 +08:00
eb5efd9a6c refactor(property): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 13:52:02 +08:00
5a88e94c23 refactor(property): 水电气表字段更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 13:42:03 +08:00
b4228c0425 feat(property): 添加仪表抄记功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 12:38:54 +08:00
dy
49ec73df49 1 2025-07-19 09:52:37 +08:00
aa5b0b9478 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 20:57:02 +08:00
6163532f39 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 17:48:04 +08:00
dy
625be80cf2 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 11:07:22 +08:00
dy
5d042a2151 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-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
9f2c4658a0 新增费用功能 2025-07-18 09:21:44 +08:00
894cb912f0 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 16:22:16 +08:00
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
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
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
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
54655ae6d6 修改巡检任务bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 11:52:38 +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
0cf20a8408 1、入驻单位状态修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 10:14:18 +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