魏少阳 915be9fb52 Merge branch 'release' into International-language+20240725 ...

# Conflicts:
#	.DS_Store
#	lan/lan_zh.json
#	lib/login/login/starLock_login_xhj_page.dart
#	lib/login/register/starLock_register_xhj_page.dart
#	lib/main/lockDetail/lockDetail/lockDetail_page.dart
#	lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
#	lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart
#	lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart
#	lib/mine/mineSet/mineSet/mineSet_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart

2024-08-14 13:58:08 +08:00

..

electronicKeyDetail

Merge branch 'release' into International-language+20240725

2024-08-14 13:58:08 +08:00

electronicKeyList

国际化统一到cancel

2024-07-26 09:21:22 +08:00

massSendElectronicKey

Merge branch 'release' into International-language+20240725

2024-08-14 13:58:08 +08:00

sendElectronicKey/sendElectronicKey

国际化统一到openNow字段

2024-08-01 18:54:32 +08:00

sendEmailNotification

1，修复星锁点分享界面少了发送密码到、分享

2024-07-08 18:18:20 +08:00