Commit Graph

332 Commits

Author SHA1 Message Date
c49bc001bb 修改了社区bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 10:58:17 +08:00
81ebb3e8c1 修改了社区bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 10:20:38 +08:00
31291b4413 增加工单看板功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 20:52:32 +08:00
dy
a24c9dce47 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-23 19:28:14 +08:00
dy
2631febd2a 新增时间的问题 2025-07-23 19:27:43 +08:00
8ae12277d8 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 17:32:11 +08:00
1124b832ac feat(sis): 添加权限组⇄设备关联功能 2025-07-23 17:30:27 +08:00
dy
919d0937cd 考勤组bug修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 17:13:41 +08:00
dy
1388e918c3 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-23 16:20:57 +08:00
dy
5da0665092 考勤组bug修改 2025-07-23 16:20:25 +08:00
e026c73627 修改了会议记录bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 15:20:06 +08:00
99c15c311f 修改了会议记录bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 15:01:21 +08:00
2c8d32f945 feat(property): 添加权限组字段
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 13:15:13 +08:00
d540a37543 feat(sis): 更新授权组相关实体
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 13:09:30 +08:00
5d2aa88690 feat(sis): 添加授权组管理功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 10:54:33 +08:00
350b8f511c 新增客户服务功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 09:28:20 +08:00
359e73fa97 新增客户服务功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 20:53:33 +08:00
lxj
9ac415d6fc 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 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
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
1c64023502 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 11:40:20 +08:00
b95f99532f feat(sis): 电梯授权增加楼层选择功能 2025-07-22 11:40:00 +08:00
77b345e017 sso
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 10:13:14 +08:00
lxj
c9c6f229bd 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-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
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-21 21:00:50 +08:00
15683799673
ed091501d7 增加按需取流接口 2025-07-21 21:00:40 +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
4010cc7dfa 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
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
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
7511227e51 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 19:23:41 +08:00
a198e0c720 fix(property): 2025-07-20 19:23:22 +08:00
0e5e73be26 sso
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 18:50:36 +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
426717e9cc feat(sis): 新增智能照明控制功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:24:30 +08:00
498209cb87 feat(sdk): 添加电表和水表通信工具类
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:01:54 +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