Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/canteen/menuScreen.vue

@@ -18,7 +18,7 @@
           :show-header="true"
           style="
             width: 100%;
-            height: calc(100vh - 30vh);
+            height: calc(100vh - 32vh);
             font-size: 4.5vh;
             font-weight: 200;
             overflow-y: auto;
@@ -53,7 +53,7 @@
       </div>
     </div>
 
-    <p class="people">{{ nowDate }}园区打卡人数:{{ dakaNum }}人</p>
+    <p class="people">园区打卡人数:{{ dakaNum }}人（{{ nowDate }}）</p>
   </div>
 </template>