|
|
4271085e78
|
用户注销
|
2025-08-01 09:58:33 +08:00 |
|
|
|
a3a1d43dde
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceBindRecord.java
|
2025-08-01 09:06:03 +08:00 |
|
|
|
5f4b12a320
|
设备绑定优化
|
2025-08-01 09:00:32 +08:00 |
|
|
|
7bd652f9b8
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-31 09:23:34 +08:00 |
|
|
|
0dc896586d
|
Merge branch 'dyf-device'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
|
2025-07-31 09:16:52 +08:00 |
|
|
|
5a23359112
|
WEB端解绑设备
|
2025-07-31 09:08:17 +08:00 |
|
|
|
ceeda046ea
|
WEB端解绑设备
|
2025-07-30 18:39:12 +08:00 |
|
|
|
a119ccc8d6
|
设备mqtt收发数据
|
2025-07-30 17:13:57 +08:00 |
|
|
|
ac353b1078
|
设备mqtt收发数据
|
2025-07-30 08:50:44 +08:00 |
|
|
|
2b2edf096d
|
设备下发指令控制
|
2025-07-28 18:26:02 +08:00 |
|
|
|
e7c8e245ba
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 11:01:01 +08:00 |
|
|
|
e4dbee15dd
|
设备分享功能开发
|
2025-07-22 18:37:02 +08:00 |
|
|
|
9338b0d24b
|
设备详情功能开发
|
2025-07-21 15:24:26 +08:00 |
|
|
|
8750bc8e10
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-21 08:43:34 +08:00 |
|
|
|
69c4cc2004
|
APP设备分享功能开发2
|
2025-07-19 14:28:07 +08:00 |
|
|
|
e9227dea89
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java
|
2025-07-19 14:24:21 +08:00 |
|
|
|
b369b28949
|
新增忘记密码手机短信验证码
|
2025-07-19 14:23:29 +08:00 |
|
|
|
f1d1528c40
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java
|
2025-07-19 10:26:52 +08:00 |
|
|
|
13986bb493
|
APP设备分享功能开发
|
2025-07-19 09:36:35 +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 |
|
|
|
eb1552d982
|
绑定蓝牙问题修复
|
2025-07-12 09:56:26 +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 |
|
|
|
c3b7849190
|
app支持上传多个文件
|
2025-07-10 18:45:43 +08:00 |
|
|
|
a708889117
|
app删除文件
|
2025-07-10 18:12:41 +08:00 |
|
|
|
ff81b791fc
|
设备列表查询
|
2025-07-10 08:57:36 +08:00 |
|
|
|
908ca6753e
|
app设备类型查询
|
2025-07-09 13:41:08 +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 |
|
|
|
ec513015a9
|
删除设备controller
|
2025-07-05 15:03:01 +08:00 |
|
|
|
f2a6f16cdd
|
操作说明和产品参数
|
2025-07-04 15:10:36 +08:00 |
|
|
|
c3a9f4a365
|
app文件管理
|
2025-07-03 14:07:32 +08:00 |
|
|
|
3e07891760
|
操作视频管理
|
2025-07-02 16:36:40 +08:00 |
|
|
|
5336170b2d
|
app登录优化，操作视频管理模块接口实现
|
2025-07-02 15:27:32 +08:00 |
|
|
|
24c511b15e
|
app登录提交
|
2025-07-01 16:04:47 +08:00 |
|
|
|
dd8b685de3
|
Merge remote-tracking branch 'origin/APP权限登录改造'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
|
2025-07-01 14:31:13 +08:00 |
|
|
|
42b7628a16
|
修复编译报错问题
|
2025-07-01 14:30:06 +08:00 |
|
|
|
103579421c
|
合并app登录权限分支
|
2025-07-01 14:12:41 +08:00 |
|
|
|
86e3c1f455
|
APP退出功能优化
|
2025-06-30 15:29:49 +08:00 |
|
|
|
f78ba3199c
|
APP登录
|
2025-06-28 16:28:15 +08:00 |
|
