Commit Graph

74 Commits

Author SHA1 Message Date
87f2e3a8b5 web:prod 配置 2025-07-10 08:40:45 +08:00
c075c09ee7 web:更新设备信息 2025-07-09 16:59:54 +08:00
3fb692e7fb web:撤回设备 2025-07-09 16:29:25 +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
0d3b48bbbb web:设备管理 2025-07-08 15:25:45 +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
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
08b1f73af1 设备类型管理 2025-07-08 11:09:14 +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
26cba479e2 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-07 11:41:04 +08:00
f338ef47d1 修改APP用户信息 2025-07-07 11:40:46 +08:00
952077da92 新增客户 2025-07-07 10:56:14 +08:00
6b2ebf2414 mqtt协议 2025-07-07 09:46:39 +08:00
04766447e6 图片转Rgb565C 2025-07-05 17:04:56 +08:00
2a06c18f35 WEB端查看APP客户设备绑定 2025-07-05 16:29:31 +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
2d34120b45 WEB:分页查询设备列表 2025-07-04 15:49:23 +08:00
3947f9b6f0 WEB:分页查询设备列表 2025-07-04 15:42:10 +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
e8aee3039a WEB:导出数据设备 2025-07-03 17:53:10 +08:00
0271a84bc2 WEB:设备类型管理 2025-07-03 16:58:08 +08:00
4e83e3570a WEB:客户管理 2025-07-03 15:30:18 +08:00
5bc56ca36d WEB:客户管理 2025-07-03 14:17:53 +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
2a81385554 新增设备 2025-07-02 15:29:09 +08:00
5336170b2d app登录优化,操作视频管理模块接口实现 2025-07-02 15:27:32 +08:00
4220428f92 fel 2025-07-02 14:47:17 +08:00
a487e7ae67 清空所有客户端缓存 2025-07-02 14:16:11 +08:00
a69aad227a 设备类型管理 2025-07-02 11:25:41 +08:00
6b802f4546 APP:客户设备管理 2025-07-02 09:52:53 +08:00
2673320f02 WEB:客户管理 接口 2025-07-01 16:40:59 +08:00