Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/business/components/business-crud-page.vue
2026-08-25 00:11:14 +08:00
parent 1ef050dda6 21c4168867
commit e5992a0c63
36 changed files with 560 additions and 330 deletions
@@ -156,7 +156,7 @@ export const option = {
      ],
    },
    {
-      label: '评定(复核)单位',
+      label: '评定（复核）单位',
      prop: 'assessmentUnit',
      minWidth: 160,
      overHidden: true,