Merge remote-tracking branch 'origin/dev' into dev

2024-02-27 14:34:52 +08:00 · 2024-02-27 14:34:52 +08:00 · 80f6ea3154
parent 2b8f984cd8 73e07c5bf8
commit 80f6ea3154
1 changed files with 2 additions and 2 deletions
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@ -197,7 +197,7 @@
        :show-overflow-tooltip="true"
      />
      <el-table-column
-        label="退料申请时间"
+        label="申请时间"
        align="center"
        prop="backTime" 
        :show-overflow-tooltip="true"
@ -209,7 +209,7 @@
        :show-overflow-tooltip="true"
      />
      <el-table-column
-        label="是否异常退料"
+        label="异常退料"
        align="center"
        prop="dictName" 
        :show-overflow-tooltip="true"