|
|
80b944cbf0
|
Merge remote-tracking branch 'upstream/main' into fys-prod
# Conflicts:
# fys-admin/pom.xml
|
2025-07-23 10:57:03 +08:00 |
|
|
|
da6b888934
|
Merge branch 'dyf-device'
|
2025-07-23 10:54:20 +08:00 |
|
|
|
619356209b
|
删除设备
|
2025-07-23 10:53:26 +08:00 |
|
|
|
d84a7cde3b
|
帐号状态（0正常 1停用）status
|
2025-07-23 09:52:28 +08:00 |
|
|
|
e4dbee15dd
|
设备分享功能开发
|
2025-07-22 18:37:02 +08:00 |
|
|
|
33e53de5a1
|
设备主题
|
2025-07-22 16:13:39 +08:00 |
|
|
|
3bce279d7b
|
修改客户-用户名重复校验
|
2025-07-22 09:58:49 +08:00 |
|
|
|
9338b0d24b
|
设备详情功能开发
|
2025-07-21 15:24:26 +08:00 |
|
|
|
537cc0b2d7
|
Merge branch 'main' into fys-prod
# Conflicts:
# pom.xml
|
2025-07-21 08:45:53 +08:00 |
|
|
|
8750bc8e10
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-21 08:43:34 +08:00 |
|
|
|
6dde6c3a3b
|
去掉demo
|
2025-07-21 08:42:21 +08:00 |
|
|
|
879e485056
|
Merge branch 'dyf-device'
|
2025-07-21 08:39:55 +08:00 |
|
|
|
bb096f53cd
|
去除demo模块
|
2025-07-19 16:16:22 +08:00 |
|
|
|
38724dbfad
|
Merge branch 'main' into fys-prod
|
2025-07-19 15:58:51 +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 |
|
|
|
a7340c744e
|
APP客户设备绑定-绑定时间
|
2025-07-19 14:22:36 +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 |
|
|
|
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 |
|
|
|
f2921ff12f
|
分页查询设备-设备类型
|
2025-07-19 09:17:14 +08:00 |
|
|
|
ec89dd8c1e
|
新增设备 校验
|
2025-07-18 18:12:36 +08:00 |
|
|
|
57322c9c87
|
蓝牙名称
|
2025-07-18 17:57:58 +08:00 |
|
|
|
73e1df4232
|
Merge branch 'main' into fys-prod
|
2025-07-18 16:30:02 +08:00 |
|
|
|
4e608b8f3a
|
merge upstream
|
2025-07-18 16:24:05 +08:00 |
|
|
|
7d91426414
|
Merge branch 'dyf-device'
|
2025-07-18 15:17:18 +08:00 |
|
|
|
ad06811747
|
撤回设备
|
2025-07-18 15:06:39 +08:00 |
|
|
|
aeaa906bc9
|
Merge pull request 'feat(fys-demo): 添加视频上传和处理功能' (#5) from liwenlong/fys-Multi-tenant:jingquan into main
Reviewed-on: dyf/fys-Multi-tenant#5
|
2025-07-18 14:03:18 +08:00 |
|
|
|
36092932bf
|
feat(fys-demo): 添加视频上传和处理功能
- 新增 VideoUploadController 控制器处理视频上传
- 添加视频帧提取和转换为 RGB565 格式功能
- 实现视频文件大小和格式校验
- 优化临时文件创建和清理逻辑
- 引入 javacv-platform依赖进行视频处理
|
2025-07-18 13:27:26 +08:00 |
|
|
|
34188f20dd
|
帐号状态（0正常 1停用）
|
2025-07-18 11:18:30 +08:00 |
|
|
|
0fa0e4ab1b
|
帐号状态（0正常 1停用）
|
2025-07-18 10:36:02 +08:00 |
|
|
|
e321dcd652
|
修改客户状态
|
2025-07-18 10:23:04 +08:00 |
|
|
|
e35955f156
|
prod
|
2025-07-17 17:27:14 +08:00 |
|
|
|
3c2d97aaf2
|
提交
|
2025-07-17 17:17:30 +08:00 |
|
|
|
6ed1241a6d
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml
|
2025-07-17 17:03:25 +08:00 |
|
|
|
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 |
|
|
|
7be94fe1d2
|
产品参数bug修改
|
2025-07-15 15:59:32 +08:00 |
|
|
|
6f24759361
|
发送指令显示工具
|
2025-07-15 15:58:12 +08:00 |
|
|
|
1cf7c47ef9
|
正式环境配置提交
|
2025-07-14 16:28:54 +08:00 |
|
|
|
530ee83488
|
新增绑定时间字段
|
2025-07-14 14:23:17 +08:00 |
|
|
|
f938716e2d
|
分页查询APP用户信息列表
|
2025-07-14 10:03:51 +08:00 |
|
|
|
bbf1c6cfd5
|
分页查询设备:设备类型自动更新
|
2025-07-14 09:13:30 +08:00 |
|
|
|
082f890009
|
登录查询用户新增用户类型查询条件
|
2025-07-14 09:02:13 +08:00 |
|
