Merge branch 'dev_feature' into dev

ui调整
# Conflicts:
#	ln_jq_app/lib/pages/b_page/reservation/controller.dart
#	ln_jq_app/lib/pages/b_page/site/controller.dart
#	ln_jq_app/lib/pages/b_page/site/view.dart
#	ln_jq_app/lib/pages/c_page/mine/view.dart
#	ln_jq_app/lib/pages/c_page/reservation/controller.dart
#	ln_jq_app/lib/pages/c_page/reservation/view.dart
#	ln_jq_app/lib/pages/login/view.dart

ln_jq_app/lib/pages/b_page/site/controller.dart

@@ -143,6 +143,7 @@ class SiteController extends GetxController with BaseControllerMixin {
   Timer? _refreshTimer;
 
   final TextEditingController searchController = TextEditingController();
+  bool isNotice = false;
 
   @override
   bool get listenLifecycleEvent => true;
@@ -167,7 +168,7 @@ class SiteController extends GetxController with BaseControllerMixin {
     searchController.dispose();
     super.onClose();
   }
-  bool isNotice = false;
+
   Future<void> msgNotice() async {
     final Map<String, dynamic> requestData = {
       'appFlag': 1,