|
|
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 |
|
|
|
f8c53451c0
|
修改灯光上报状态
|
2025-08-15 18:16:37 +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 |
|
|
|
9de55857bc
|
晶全日志配置
|
2025-08-07 18:07:04 +08:00 |
|
|
|
c2eb5ba524
|
日志配置
|
2025-08-06 09:12:47 +08:00 |
|
|
|
6827ff0a3c
|
设备mqtt收发数据2
|
2025-07-30 17:14:48 +08:00 |
|
|
|
a119ccc8d6
|
设备mqtt收发数据
|
2025-07-30 17:13:57 +08:00 |
|
|
|
c73a700210
|
app登录配置修改
|
2025-07-11 17:39:53 +08:00 |
|
|
|
87f2e3a8b5
|
web：prod 配置
|
2025-07-10 08:40:45 +08:00 |
|
|
|
ad82ab5fca
|
APP/小程序用户设备绑定
|
2025-07-05 15:55:46 +08:00 |
|
|
|
4e83e3570a
|
WEB：客户管理
|
2025-07-03 15:30:18 +08:00 |
|
|
|
b06e071196
|
WEB：客户管理
|
2025-07-03 11:39:49 +08:00 |
|
|
|
a487e7ae67
|
清空所有客户端缓存
|
2025-07-02 14:16:11 +08:00 |
|
|
|
e0bc282097
|
Merge remote-tracking branch 'origin/APP权限登录改造'
# Conflicts:
# fys-modules/pom.xml
# pom.xml
|
2025-07-01 13:58:39 +08:00 |
|
|
|
4add59d197
|
增加 设备管理模块 接口文档
|
2025-06-30 09:47:23 +08:00 |
|
|
|
f78ba3199c
|
APP登录
|
2025-06-28 16:28:15 +08:00 |
|
|
|
b94549185c
|
fys
|
2025-06-27 10:23:57 +08:00 |
|
