|
|
4663a5560f
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-25 14:32:19 +08:00 |
|
|
|
8811c30a97
|
web端控制中心2
|
2025-08-23 16:39:30 +08:00 |
|
|
|
75756eb8ab
|
Merge remote-tracking branch 'upstream/6170'
# Conflicts:
# fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java
|
2025-08-19 14:11:02 +08:00 |
|
|
|
8a6c196fb9
|
访问控制
|
2025-08-14 11:51:27 +08:00 |
|
|
|
61ed9f0154
|
提交
|
2025-08-12 17:03:11 +08:00 |
|
|
|
83458d0060
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
# fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java
# fys-admin/src/main/resources/application-prod.yml
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java
|
2025-08-07 18:10:47 +08:00 |
|
|
|
57f074995e
|
发送设备信息代码实现
|
2025-08-04 15:35:59 +08:00 |
|
|
|
7bd652f9b8
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-31 09:23:34 +08:00 |
|
|
|
ac353b1078
|
设备mqtt收发数据
|
2025-07-30 08:50:44 +08:00 |
|
|
|
2b2edf096d
|
设备下发指令控制
|
2025-07-28 18:26:02 +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 |
|
|
|
fdb64b1dcc
|
小程序：相关接口
|
2025-07-12 13:57:31 +08:00 |
|
|
|
24f0caacd5
|
绑定蓝牙问题解决
|
2025-07-12 09:52:14 +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 |
|
|
|
cad7a9b725
|
Merge remote-tracking branch 'origin/dyf-device'
|
2025-07-08 11:26:24 +08:00 |
|
|
|
04766447e6
|
图片转Rgb565C
|
2025-07-05 17:04:56 +08:00 |
|
|
|
d456236599
|
WEB：导入设备数据
|
2025-07-04 11:02:22 +08:00 |
|
|
|
b06e071196
|
WEB：客户管理
|
2025-07-03 11:39:49 +08:00 |
|
|
|
abe9dc2fe8
|
分页查询客户
|
2025-07-03 10:08:09 +08:00 |
|
|
|
5917234ca8
|
新增客户
|
2025-07-02 17:53:53 +08:00 |
|
|
|
4220428f92
|
fel
|
2025-07-02 14:47:17 +08:00 |
|
|
|
e0bc282097
|
Merge remote-tracking branch 'origin/APP权限登录改造'
# Conflicts:
# fys-modules/pom.xml
# pom.xml
|
2025-07-01 13:58:39 +08:00 |
|
|
|
53356957f3
|
设备管理 接口
|
2025-07-01 13:53:03 +08:00 |
|
|
|
f9f5569504
|
分页查询设备
|
2025-06-28 17:18:05 +08:00 |
|
|
|
f78ba3199c
|
APP登录
|
2025-06-28 16:28:15 +08:00 |
|
|
|
b94549185c
|
fys
|
2025-06-27 10:23:57 +08:00 |
|
