|
78e2538f71
|
Merge branch 'dyf-device'
|
2025-07-17 16:41:08 +08:00 |
|
|
faef79e56d
|
return R.ok();
|
2025-07-17 16:29:25 +08:00 |
|
|
7b1615ce4d
|
WEB端解绑设备
|
2025-07-17 16:20:22 +08:00 |
|
|
171eeabea1
|
Merge branch 'dyf-device'
|
2025-07-17 09:24:10 +08:00 |
|
|
cc776300ec
|
删除设备 逻辑修改
|
2025-07-17 09:23:11 +08:00 |
|
|
04df7e3ec7
|
可靠点阵生成工具 - 终极版
|
2025-07-16 08:46:21 +08:00 |
|
|
6f24759361
|
发送指令显示工具
|
2025-07-15 15:58:12 +08:00 |
|
|
530ee83488
|
新增绑定时间字段
|
2025-07-14 14:23:17 +08:00 |
|
|
bbf1c6cfd5
|
分页查询设备:设备类型自动更新
|
2025-07-14 09:13:30 +08:00 |
|
|
cfafbc54f7
|
Merge branch 'dyf-device'
|
2025-07-12 14:01:00 +08:00 |
|
|
fdb64b1dcc
|
小程序:相关接口
|
2025-07-12 13:57:31 +08:00 |
|
|
fbbe90207e
|
解绑问题修复
|
2025-07-12 10:41:13 +08:00 |
|
|
eb1552d982
|
绑定蓝牙问题修复
|
2025-07-12 09:56:26 +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 |
|
|
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 |
|
|
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 |
|
|
b26cb873b5
|
Merge remote-tracking branch 'origin/main' into dyf-device
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
|
2025-07-08 09:05:31 +08:00 |
|
|
43f6f2ca0b
|
设备绑定,解绑
|
2025-07-08 09:00:14 +08:00 |
|
|
d301e9da3c
|
短信验证码
|
2025-07-07 15:34:02 +08:00 |
|
|
f338ef47d1
|
修改APP用户信息
|
2025-07-07 11:40:46 +08:00 |
|
|
952077da92
|
新增客户
|
2025-07-07 10:56:14 +08:00 |
|
|
ad82ab5fca
|
APP/小程序用户设备绑定
|
2025-07-05 15:55:46 +08:00 |
|
|
2d34120b45
|
WEB:分页查询设备列表
|
2025-07-04 15:49:23 +08:00 |
|
|
3947f9b6f0
|
WEB:分页查询设备列表
|
2025-07-04 15:42:10 +08:00 |
|
|
d456236599
|
WEB:导入设备数据
|
2025-07-04 11:02:22 +08:00 |
|
|
e8aee3039a
|
WEB:导出数据设备
|
2025-07-03 17:53:10 +08:00 |
|