Merge branch 'master' of http://git.ius.plus/Project-Vital/VitalApp

# Conflicts:
#	lib/pages/medical_checkup_station/registration/controller/list.dart
#	pubspec.yaml

pubspec.lock

@@ -367,8 +367,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "504fdbc"
-      resolved-ref: "504fdbcf96d685b2839d8f53321e52fef02f6e50"
+      ref: f9b819a
+      resolved-ref: f9b819a245305e27de0e086eb1c1b4d3e5909c8f
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git"
     source: git
     version: "0.0.1"
@@ -480,10 +480,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_blue_plus
-      sha256: a4e2e7d536f24dfc265a4eb43b63a1293bf6d972ddd243dc3ed2d900b38d9a4d
+      sha256: "3a1299f3a5b97047fb66e48fc9f371ea2aca0d3fb40b380c440aa8392066ac98"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.31.16"
+    version: "1.31.15"
   flutter_easyloading:
     dependency: "direct main"
     description: