Merge branch 'main' into dev

# Conflicts:
#	ln_jq_app/android/app/src/main/AndroidManifest.xml
#	ln_jq_app/pubspec.lock
同步线上

ln_jq_app/pubspec.yaml

@@ -46,7 +46,6 @@ dependencies:
   dropdown_button2: ^2.3.8
   image_picker: ^1.2.1 # 用于从相册选择图片
   image: ^4.5.4
-  mobile_scanner: ^7.1.4
   flutter_pdfview: 1.4.3 #显示pdf
   photo_view: ^0.15.0 #操作图片
   flutter_inappwebview: ^6.1.5 # WebView插件
@@ -66,6 +65,7 @@ dev_dependencies:
 
 dependency_overrides:
   intl: 0.19.0
+  device_info_plus: ^12.3.0
 
 flutter: