From f43c3e45aa4fa2b8dd74775894808765bf076908 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 14:28:40 +0800
Subject: [PATCH] 大屏

---
 screen_standard/src/stores/counter.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen_standard/src/stores/counter.js b/screen_standard/src/stores/counter.js
index e3364b2..69cea87 100644
--- a/screen_standard/src/stores/counter.js
+++ b/screen_standard/src/stores/counter.js
@@ -5,6 +5,9 @@
 
   state: () => {
     // 678
+<<<<<<< HEAD
+    return { companyId: '', departId: '' };
+=======
     return {
       companyId: '8',
       departId: '132',
@@ -14,6 +17,7 @@
       prouserNum: 0, // 浠婃棩鐢熶骇浜烘暟
       unqualifiedRate: 0 // 浠婃棩涓嶈壇鍝佺巼
     };
+>>>>>>> 8eebd3b823c2e477f949b7f06b6e972ec09327df
   },
 
   actions: {

--
Gitblit v1.9.3