合并

config/users.php

@@ -3,7 +3,7 @@
 return [
 
 
-    'superAdmin' => ['ldaaww','baoshi56','zhouyaping','shiyao','zhouzhendong','胡浩','zengjun','阿珺',],
+    'superAdmin' => ['ldaaww','baoshi56','周亚萍','shiyao','zhouzhendong','胡浩','zengjun','阿珺',],
     'token_expire_minutes'=>7200,
     'token_check_in_expire_minutes'=>432000, //打卡过期时间，单位为秒
 ];

resources/views/process/create.blade.php

@@ -20,7 +20,7 @@
                             </div>
                             <div class="modal-body">
                                 <textarea class="w-100" style="height: 400px;" v-model="pasteData"
-                                placeholder="内容必须为EXCEL复制,请注意表头顺序,可拖拽调整顺序，以该顺序为准"
+                                placeholder="内容必须为EXCEL复制,请注意表头顺序,可拖拽表头字段调整顺序，以该顺序为准"
                                 ></textarea>
                             </div>
                             <div class="modal-footer">
@@ -582,7 +582,7 @@
                                 $('#pasteData').modal('hide');
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('导入完毕');
-                            } 
+                            }
                         }).catch(err=>{
                             tempTip.setDuration(4000);
                             tempTip.showSuccess('网络错误：'+err);