Merge branch 'dev' into sit

src/views/goodStore/goodsOffline/columns.js

@@ -62,7 +62,7 @@ const columns = [
     },
     {
       prop: "creater",
-      label: "操作人",
+      label: "申请人",
       span: 6
     },
     {

src/views/process/columns.js

@@ -223,7 +223,11 @@ const readUnRead =[
     label: "内容",
   },
 
-
+  {
+    prop: "apply_name",
+    minWidth:"95px",
+    label: "申请人",
+  },
   {
     prop: "action_name",
     minWidth:"95px",