55 Commits

Author SHA1 Message Date
082f890009 登录查询用户新增用户类型查询条件 2025-07-14 09:02:13 +08:00
800b825892 登录查询用户新增用户类型查询条件 2025-07-14 08:53:53 +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
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
1dc00f0431 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-10 10:11:03 +08:00
ff81b791fc 设备列表查询 2025-07-10 08:57:36 +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
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
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
26cba479e2 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-07 11:41:04 +08:00
6b2ebf2414 mqtt协议 2025-07-07 09:46:39 +08:00
ad82ab5fca APP/小程序用户设备绑定 2025-07-05 15:55:46 +08:00
ec513015a9 删除设备controller 2025-07-05 15:03:01 +08:00
5322e84a92 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-05 14:10:10 +08:00
407103a71e 修改成晶全服务器配置 2025-07-05 14:08:27 +08:00
3f4b7f0186 Merge remote-tracking branch 'origin/main' 2025-07-04 15:11:31 +08:00
f2a6f16cdd 操作说明和产品参数 2025-07-04 15:10:36 +08:00
d456236599 WEB:导入设备数据 2025-07-04 11:02:22 +08:00
3129db352e Merge branch 'dyf-device' 2025-07-04 08:34:52 +08:00
0271a84bc2 WEB:设备类型管理 2025-07-03 16:58:08 +08:00
4e83e3570a WEB:客户管理 2025-07-03 15:30:18 +08:00
c3a9f4a365 app文件管理 2025-07-03 14:07:32 +08:00
b06e071196 WEB:客户管理 2025-07-03 11:39:49 +08:00
abe9dc2fe8 分页查询客户 2025-07-03 10:08:09 +08:00
fe6de8f5bc Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-02 17:54:56 +08:00
5917234ca8 新增客户 2025-07-02 17:53:53 +08:00
3e07891760 操作视频管理 2025-07-02 16:36:40 +08:00
5336170b2d app登录优化,操作视频管理模块接口实现 2025-07-02 15:27:32 +08:00
a487e7ae67 清空所有客户端缓存 2025-07-02 14:16:11 +08:00
2673320f02 WEB:客户管理 接口 2025-07-01 16:40:59 +08:00
24c511b15e app登录提交 2025-07-01 16:04:47 +08:00
4eeb21b5f7 Merge branch 'main' into dyf-device
# Conflicts:
#	fys-modules/pom.xml
#	pom.xml
2025-07-01 15:28:11 +08:00
9f6538b449 客户管理 接口 2025-07-01 15:24:09 +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
e0bc282097 Merge remote-tracking branch 'origin/APP权限登录改造'
# Conflicts:
#	fys-modules/pom.xml
#	pom.xml
2025-07-01 13:58:39 +08:00
eac1b2e016 添加设备 2025-06-30 16:59:12 +08:00
0969a7cd1f 模拟前端 登录测试 2025-06-30 15:44:53 +08:00
86e3c1f455 APP退出功能优化 2025-06-30 15:29:49 +08:00