|
|
7773cae0ea
|
配置文件提交2
|
2025-09-05 10:52:53 +08:00 |
|
|
|
a8c9c631ad
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-27 09:12:05 +08:00 |
|
|
|
364574eeae
|
web端控制中心3
|
2025-08-27 08:59:29 +08:00 |
|
|
|
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 |
|
|
|
5b6927729f
|
WebApp用户信息
|
2025-08-21 15:17:11 +08:00 |
|
|
|
8c883688bd
|
Merge remote-tracking branch 'origin/fys-prod'
|
2025-08-21 15:12:00 +08:00 |
|
|
|
c34a39a308
|
WebApp用户信息
|
2025-08-21 15:11:22 +08:00 |
|
|
|
7b842f5cc7
|
查询APP用户信息列表
|
2025-08-21 11:48:36 +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 |
|
|
|
6d6db190b9
|
设备分享2
|
2025-08-16 11:30:06 +08:00 |
|
|
|
adc3834ddc
|
Merge branch 'main' into 6170
|
2025-08-15 10:15:56 +08:00 |
|
|
|
33f3cb5989
|
app增加字典
|
2025-08-15 10:14:35 +08:00 |
|
|
|
f1a3a0325b
|
添加告警处理逻辑6
|
2025-08-14 18:28:55 +08:00 |
|
|
|
9e24e3daaf
|
添加告警处理逻辑4
|
2025-08-14 17:38:07 +08:00 |
|
|
|
61ed9f0154
|
提交
|
2025-08-12 17:03:11 +08:00 |
|
|
|
bc165f5d60
|
分享管理
|
2025-08-09 17:09:26 +08:00 |
|
|
|
af64984623
|
修改分享功能
|
2025-08-09 08:49:37 +08:00 |
|
|
|
65caea4a00
|
解决冲突
|
2025-08-07 18:17:49 +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 |
|
|
|
f67e848256
|
晶全6710
|
2025-08-07 15:41:57 +08:00 |
|
|
|
51d9d7319a
|
app设备列表查询，新增纬度经度
|
2025-08-01 11:11:36 +08:00 |
|
|
|
2cb4f5b83e
|
设备绑定优化2
|
2025-08-01 09:07:27 +08:00 |
|
|
|
a3a1d43dde
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceBindRecord.java
|
2025-08-01 09:06:03 +08:00 |
|
|
|
5f4b12a320
|
设备绑定优化
|
2025-08-01 09:00:32 +08:00 |
|
|
|
74be5321ec
|
代码优化2
|
2025-07-31 19:03:04 +08:00 |
|
|
|
370783b457
|
代码优化
|
2025-07-31 18:09:20 +08:00 |
|
|
|
7bd652f9b8
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-31 09:23:34 +08:00 |
|
|
|
2b2edf096d
|
设备下发指令控制
|
2025-07-28 18:26:02 +08:00 |
|
|
|
e7c8e245ba
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 11:01:01 +08:00 |
|
|
|
e4dbee15dd
|
设备分享功能开发
|
2025-07-22 18:37:02 +08:00 |
|
|
|
9338b0d24b
|
设备详情功能开发
|
2025-07-21 15:24:26 +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 |
|
|
|
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 |
|
|
|
7be94fe1d2
|
产品参数bug修改
|
2025-07-15 15:59:32 +08:00 |
|
|
|
f938716e2d
|
分页查询APP用户信息列表
|
2025-07-14 10:03:51 +08:00 |
|
|
|
bdee8c8383
|
Merge remote-tracking branch 'origin/main'
|
2025-07-12 15:31:42 +08:00 |
|
|
|
6f4e18fb3f
|
文件管理代码优化
|
2025-07-12 15:31:27 +08:00 |
|
|
|
3ca6b69709
|
merge upstream
|
2025-07-12 14:04:03 +08:00 |
|
|
|
fdb64b1dcc
|
小程序：相关接口
|
2025-07-12 13:57:31 +08:00 |
|
|
|
56704f6014
|
个人中心修改
|
2025-07-12 10:18:12 +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 |
|
|
|
b5ebc8855d
|
Merge branch 'main' into jingquan
|
2025-07-11 11:36:41 +08:00 |
|
|
|
99aef4b353
|
Merge branch 'main' into dyf-device
|
2025-07-11 11:36:17 +08:00 |
|
|
|
a423ac0f8b
|
app设备解绑
|
2025-07-11 11:34:30 +08:00 |
|
