0
0
Commit Graph

51 Commits

Author SHA1 Message Date
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
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
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
0271a84bc2 WEB:设备类型管理 2025-07-03 16:58:08 +08:00
abe9dc2fe8 分页查询客户 2025-07-03 10:08:09 +08:00
5917234ca8 新增客户 2025-07-02 17:53:53 +08:00
2a81385554 新增设备 2025-07-02 15:29:09 +08:00
a487e7ae67 清空所有客户端缓存 2025-07-02 14:16:11 +08:00
a69aad227a 设备类型管理 2025-07-02 11:25:41 +08:00
53356957f3 设备管理 接口 2025-07-01 13:53:03 +08:00
440aec266b 设备类型管理接口 2025-07-01 09:32:22 +08:00
933e74235f 设备类型管理 2025-06-30 18:03:43 +08:00
eac1b2e016 添加设备 2025-06-30 16:59:12 +08:00