|
|
bdee8c8383
|
Merge remote-tracking branch 'origin/main'
|
2025-07-12 15:31:42 +08:00 |
|
|
|
6f4e18fb3f
|
文件管理代码优化
|
2025-07-12 15:31:27 +08:00 |
|
|
|
3ca6b69709
|
merge upstream
|
2025-07-12 14:04:03 +08:00 |
|
|
|
cfafbc54f7
|
Merge branch 'dyf-device'
|
2025-07-12 14:01:00 +08:00 |
|
|
|
fdb64b1dcc
|
小程序：相关接口
|
2025-07-12 13:57:31 +08:00 |
|
|
|
e13e3c57a6
|
解绑问题修改2
|
2025-07-12 10:41:35 +08:00 |
|
|
|
fbbe90207e
|
解绑问题修复
|
2025-07-12 10:41:13 +08:00 |
|
|
|
56704f6014
|
个人中心修改
|
2025-07-12 10:18:12 +08:00 |
|
|
|
2f38f08538
|
Merge remote-tracking branch 'origin/main'
|
2025-07-12 09:56:42 +08:00 |
|
|
|
eb1552d982
|
绑定蓝牙问题修复
|
2025-07-12 09:56:26 +08:00 |
|
|
|
4f00c69f91
|
绑定优化2
|
2025-07-12 09:55:29 +08:00 |
|
|
|
fcd17634dc
|
绑定优化
|
2025-07-12 09:54:08 +08:00 |
|
|
|
24f0caacd5
|
绑定蓝牙问题解决
|
2025-07-12 09:52:14 +08:00 |
|
|
|
c73a700210
|
app登录配置修改
|
2025-07-11 17:39:53 +08:00 |
|
|
|
3ed2f97752
|
app接口功能实现
|
2025-07-11 16:40:20 +08:00 |
|
|
|
1eb2502a21
|
revert 2815e27240
revert 晶全代码同步，app接口开发
|
2025-07-11 16:20:24 +08:00 |
|
|
|
2815e27240
|
晶全代码同步，app接口开发
|
2025-07-11 16:03:36 +08:00 |
|
|
|
f119dd158b
|
操作视频信息
|
2025-07-11 14:06:25 +08:00 |
|
|
|
a109f187b9
|
Merge branch 'main' into jingquan
|
2025-07-11 11:37:59 +08:00 |
|
|
|
b5ebc8855d
|
Merge branch 'main' into jingquan
|
2025-07-11 11:36:41 +08:00 |
|
|
|
99aef4b353
|
Merge branch 'main' into dyf-device
|
2025-07-11 11:36:17 +08:00 |
|
|
|
a423ac0f8b
|
app设备解绑
|
2025-07-11 11:34:30 +08:00 |
|
|
|
82b1494bc7
|
app支持上传多个文件2
|
2025-07-11 10:44:25 +08:00 |
|
|
|
c3b7849190
|
app支持上传多个文件
|
2025-07-10 18:45:43 +08:00 |
|
|
|
33b718c048
|
Merge remote-tracking branch 'origin/dyf-device'
|
2025-07-10 18:29:56 +08:00 |
|
|
|
a708889117
|
app删除文件
|
2025-07-10 18:12:41 +08:00 |
|
|
|
3250dd3f83
|
WEB端查看APP客户设备绑定
|
2025-07-10 15:44:57 +08:00 |
|
|
|
4cc02e1040
|
Merge remote-tracking branch 'origin/main' into dyf-device
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java
# fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
|
2025-07-10 15:16:57 +08:00 |
|
|
|
185d521472
|
WEB端查看APP客户设备绑定
|
2025-07-10 15:14:18 +08:00 |
|
|
|
7e688e16b3
|
导出数据设备
|
2025-07-10 14:57:59 +08:00 |
|
|
|
b876d051d8
|
app设备列表添加蓝牙名称
|
2025-07-10 13:33:32 +08:00 |
|
|
|
d75658e81e
|
WEB端查看APP客户设备绑定
|
2025-07-10 10:55:47 +08:00 |
|
|
|
1dc00f0431
|
Merge remote-tracking branch 'origin/main' into dyf-device
|
2025-07-10 10:11:03 +08:00 |
|
|
|
2a6b9eafb3
|
mqtt优化
|
2025-07-10 09:43:40 +08:00 |
|
|
|
f0bfc4aa35
|
app：查看APP客户设备绑定
|
2025-07-10 09:39:57 +08:00 |
|
|
|
ff81b791fc
|
设备列表查询
|
2025-07-10 08:57:36 +08:00 |
|
|
|
87f2e3a8b5
|
web：prod 配置
|
2025-07-10 08:40:45 +08:00 |
|
|
|
c075c09ee7
|
web：更新设备信息
|
2025-07-09 16:59:54 +08:00 |
|
|
|
3fb692e7fb
|
web：撤回设备
|
2025-07-09 16:29:25 +08:00 |
|
|
|
d219105b73
|
Merge remote-tracking branch 'origin/dyf-device'
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
# fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
|
2025-07-09 13:45:27 +08:00 |
|
|
|
908ca6753e
|
app设备类型查询
|
2025-07-09 13:41:08 +08:00 |
|
|
|
8a66e5ca51
|
分配客户
|
2025-07-09 13:41:03 +08:00 |
|
|
|
0d3b48bbbb
|
web:设备管理
|
2025-07-08 15:25:45 +08:00 |
|
|
|
ca47160c92
|
Merge remote-tracking branch 'origin/main' into dyf-device
|
2025-07-08 14:46:35 +08:00 |
|
|
|
64daff1647
|
web:设备管理
|
2025-07-08 14:46:05 +08:00 |
|
|
|
f41bb097fd
|
添加设备编号
|
2025-07-08 14:43:28 +08:00 |
|
|
|
b5ae17c3e3
|
Merge remote-tracking branch 'origin/dyf-device'
|
2025-07-08 11:35:03 +08:00 |
|
|
|
cad7a9b725
|
Merge remote-tracking branch 'origin/dyf-device'
|
2025-07-08 11:26:24 +08:00 |
|
|
|
08b1f73af1
|
设备类型管理
|
2025-07-08 11:09:14 +08:00 |
|
|
|
628cc1fa99
|
设备列表
|
2025-07-08 10:26:14 +08:00 |
|
