1
0
Commit Graph

35 Commits

Author SHA1 Message Date
d97ace42d0 Merge remote-tracking branch 'upstream/dyf-device' into main-dyf 2025-08-29 10:31:18 +08:00
3969e50566 查询设备分享列表(web) 2025-08-29 10:29: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
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
adc3834ddc Merge branch 'main' into 6170 2025-08-15 10:15:56 +08:00
33f3cb5989 app增加字典 2025-08-15 10:14:35 +08:00
61ed9f0154 提交 2025-08-12 17:03:11 +08:00
bc165f5d60 分享管理 2025-08-09 17:09:26 +08:00
5f4b12a320 设备绑定优化 2025-08-01 09:00:32 +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
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
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
6f4e18fb3f 文件管理代码优化 2025-07-12 15:31:27 +08:00
3ed2f97752 app接口功能实现 2025-07-11 16:40:20 +08:00
dyf
1eb2502a21 revert 2815e27240
revert 晶全代码同步,app接口开发
2025-07-11 16:20:24 +08:00
2815e27240 晶全代码同步,app接口开发 2025-07-11 16:03:36 +08:00
a708889117 app删除文件 2025-07-10 18:12:41 +08:00
f0bfc4aa35 app:查看APP客户设备绑定 2025-07-10 09:39:57 +08:00
908ca6753e app设备类型查询 2025-07-09 13:41:08 +08:00
ad82ab5fca APP/小程序用户设备绑定 2025-07-05 15:55:46 +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
3129db352e Merge branch 'dyf-device' 2025-07-04 08:34:52 +08:00
c3a9f4a365 app文件管理 2025-07-03 14:07:32 +08:00
fe6de8f5bc Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-02 17:54:56 +08:00
5336170b2d app登录优化,操作视频管理模块接口实现 2025-07-02 15:27:32 +08:00
6b802f4546 APP:客户设备管理 2025-07-02 09:52:53 +08:00
f78ba3199c APP登录 2025-06-28 16:28:15 +08:00