jingquan #10

Merged

dyf merged 27 commits from liwenlong/fys-Multi-tenant:jingquan into main 2025-09-11 14:40:24 +08:00

Conversation 0 Commits 27 Files Changed 59 +1742 -171

liwenlong commented 2025-09-11 11:09:00 +08:00

Contributor

Copy Link

No description provided.

liwenlong added 27 commits 2025-09-11 11:09:01 +08:00

通讯方式 98ef841f18

首页数据 1d37bfb719

分配客户 接口注释 d97928b38a

修改获取经纬度 98cb67b136

Merge branch 'main' into dyf-device 00e345d5e5

Merge branch 'dyf-device' into 6170 377579dd14

型号字典用于APP页面跳转 ff4db34e2a

Merge branch 'dyf-device' into 6170 429c0f1307

feat(device): 新增设备控制相关接口 ... d5a9a92f9f

- 人员信息登记- 发送紧急通知
-上传设备 logo 图片
-静电预警档位设置- 照明档位设置- SOS 档位设置- 静止报警状态设置

离线状态变更 452c37c4ca

离线状态变更2 c057af7cd0

离线状态变更3 b945420446

管理员 374a03b83d

Merge branch 'dyf-device' into 6170 1e4ee840a3

设备分享 64a4485ced

Merge remote-tracking branch 'origin/6170' into 6170 395b2957c1

开始时间 870f94b2d4

pageQuery 91f787eec7

设备操作记录 分页 f7a82ef138

Merge branch 'dyf-device' into 6170 ... 040e44984e

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java

设备分享2 5e3307d2b0

在线设备 ebd8668178

新增绑定设备 7e87971c0b

获取设备使用数据 832234269d

今日报警总数 fcbde4322d

merge upstream 228e26df7f

feat(web): 新增设备联调中心功能 ... e2274bdf09

- 新增设备联调中心相关控制器、服务、DTO和VO
- 实现设备列表查询、文件上传、操作视频添加、设备详情等功能
- 优化设备 logo 上传逻辑，支持批量上传
- 重构部分代码结构，提高可维护性

dyf merged commit d48c7b389e into main 2025-09-11 14:40:24 +08:00

dyf referenced this issue from a commit 2025-09-11 14:40:26 +08:00

Merge pull request 'jingquan' (#10) from liwenlong/fys-Multi-tenant:jingquan into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

chenyouting dyf

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: dyf/fys-Multi-tenant#10

Allow edits from maintainers

No description provided.