0
0
Commit Graph

13 Commits

Author SHA1 Message Date
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
4271085e78 用户注销 2025-08-01 09:58:33 +08:00
74be5321ec 代码优化2 2025-07-31 19:03:04 +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
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
d301e9da3c 短信验证码 2025-07-07 15:34:02 +08:00
5336170b2d app登录优化,操作视频管理模块接口实现 2025-07-02 15:27:32 +08:00
42b7628a16 修复编译报错问题 2025-07-01 14:30:06 +08:00
f78ba3199c APP登录 2025-06-28 16:28:15 +08:00