0
0
Commit Graph

67 Commits

Author SHA1 Message Date
9c9d18cddc 查询设备分组列表 2025-08-14 14:21:47 +08:00
1af4b165f2 新增设备分组 2025-08-13 19:29:04 +08:00
9fb72e5ac0 设备分组 2025-08-08 09:49:08 +08:00
f4d5f950ce 设备行为 2025-08-04 09:05:10 +08:00
8770c217ae 设备日志 2025-08-01 15:19:41 +08:00
8ae15dcd9a 修改用户状态-强制下线 2025-07-31 15:29:37 +08:00
e07dbb01b7 校验设备类型名称 2025-07-31 10:27:02 +08:00
4fa4e5ec29 Merge branch 'main' into dyf-device 2025-07-30 17:07:29 +08:00
984081ac98 设备日志 2025-07-29 11:10:03 +08:00
2b2edf096d 设备下发指令控制 2025-07-28 18:26:02 +08:00
5657c73867 新增设备:蓝牙名称 必填校验 2025-07-26 09:17:21 +08:00
d849be68ed 删除设备:分配记录 2025-07-23 19:22:25 +08:00
ad59eea2a9 删除设备:分配记录 2025-07-23 14:27:08 +08:00
619356209b 删除设备 2025-07-23 10:53:26 +08:00
33e53de5a1 设备主题 2025-07-22 16:13:39 +08:00
a7340c744e APP客户设备绑定-绑定时间 2025-07-19 14:22:36 +08:00
3feafc2cd9 删除设备类型 2025-07-19 10:20:07 +08:00
f2921ff12f 分页查询设备-设备类型 2025-07-19 09:17:14 +08:00
ec89dd8c1e 新增设备 校验 2025-07-18 18:12:36 +08:00
7d91426414 Merge branch 'dyf-device' 2025-07-18 15:17:18 +08:00
ad06811747 撤回设备 2025-07-18 15:06:39 +08:00
78e2538f71 Merge branch 'dyf-device' 2025-07-17 16:41:08 +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
530ee83488 新增绑定时间字段 2025-07-14 14:23:17 +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
a423ac0f8b app设备解绑 2025-07-11 11:34:30 +08:00
185d521472 WEB端查看APP客户设备绑定 2025-07-10 15:14:18 +08:00
7e688e16b3 导出数据设备 2025-07-10 14:57:59 +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
f338ef47d1 修改APP用户信息 2025-07-07 11:40:46 +08:00
952077da92 新增客户 2025-07-07 10:56:14 +08:00