Commit Graph

70 Commits

Author SHA1 Message Date
e6d0e883fb 管理员 2025-08-21 16:51:17 +08:00
adc3834ddc Merge branch 'main' into 6170 2025-08-15 10:15:56 +08:00
33f3cb5989 app增加字典 2025-08-15 10:14:35 +08:00
f65a8cdc8c 型号字典 modelDictionary 2025-08-15 09:40:33 +08:00
a21062b296 Merge branch 'main' into 6170 2025-08-15 09:34:17 +08:00
48e972166f 型号字典 2025-08-14 18:55:53 +08:00
447aa73ae9 Merge branch 'dyf-device' 2025-08-14 14:22:43 +08:00
9c9d18cddc 查询设备分组列表 2025-08-14 14:21:47 +08:00
1af4b165f2 新增设备分组 2025-08-13 19:29:04 +08:00
61ed9f0154 提交 2025-08-12 17:03:11 +08:00
9fb72e5ac0 设备分组 2025-08-08 09:49:08 +08:00
f67e848256 晶全6710 2025-08-07 15:41:57 +08:00
57f074995e 发送设备信息代码实现 2025-08-04 15:35:59 +08:00
f4d5f950ce 设备行为 2025-08-04 09:05:10 +08:00
99355e05b8 Merge branch 'main' into dyf-device 2025-08-01 16:27:53 +08:00
8770c217ae 设备日志 2025-08-01 15:19:41 +08:00
51d9d7319a app设备列表查询,新增纬度经度 2025-08-01 11:11:36 +08:00
370783b457 代码优化 2025-07-31 18:09:20 +08:00
abd6d3aa3c 设备日志 2025-07-29 15:22:09 +08:00
984081ac98 设备日志 2025-07-29 11:10:03 +08:00
da6b888934 Merge branch 'dyf-device' 2025-07-23 10:54:20 +08:00
e4dbee15dd 设备分享功能开发 2025-07-22 18:37:02 +08:00
33e53de5a1 设备主题 2025-07-22 16:13:39 +08:00
9338b0d24b 设备详情功能开发 2025-07-21 15:24:26 +08:00
879e485056 Merge branch 'dyf-device' 2025-07-21 08:39:55 +08:00
a7340c744e APP客户设备绑定-绑定时间 2025-07-19 14:22:36 +08:00
6bbe9cbdd1 Merge branch 'dyf-device' 2025-07-19 10:21:11 +08:00
3feafc2cd9 删除设备类型 2025-07-19 10:20:07 +08:00
13986bb493 APP设备分享功能开发 2025-07-19 09:36:35 +08:00
57322c9c87 蓝牙名称 2025-07-18 17:57:58 +08:00
7d91426414 Merge branch 'dyf-device' 2025-07-18 15:17:18 +08:00
ad06811747 撤回设备 2025-07-18 15:06:39 +08:00
530ee83488 新增绑定时间字段 2025-07-14 14:23:17 +08:00
fdb64b1dcc 小程序:相关接口 2025-07-12 13:57:31 +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
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
f0bfc4aa35 app:查看APP客户设备绑定 2025-07-10 09:39:57 +08:00
87f2e3a8b5 web:prod 配置 2025-07-10 08:40:45 +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
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
628cc1fa99 设备列表 2025-07-08 10:26:14 +08:00